RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:07:36 +00:00
Code Issues Activity Actions

Ports: Don't mangle patches when requiring manual edits

Browse source 
While at it, pass the `--3way` option to give the user something to work
with. Otherwise, Git will just prepare the commit metadata and nothing
else. Note that this has a relatively low chance of working, since the
recorded blob hashes aren't known to a freshly imported repository.
This commit is contained in:
Tim Schumacher 2023-04-19 04:36:30 +02:00 • committed by Andreas Kling
parent ce5a939148
commit fb049d6913
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/.port_include.sh
View file

@ -836,7 +836,7 @@ do_dev() {
else else
# The patch didn't apply, oh no! # The patch didn't apply, oh no!
# Ask the user to figure it out :shrug: # Ask the user to figure it out :shrug:
git am "$patch" || true git am --keep-cr --keep-non-patch --3way "$patch" || true
>&2 echo "- This patch does not apply, you'll be dropped into a shell to investigate and fix this, quit the shell when the problem is resolved." >&2 echo "- This patch does not apply, you'll be dropped into a shell to investigate and fix this, quit the shell when the problem is resolved."
>&2 echo "Note that the patch needs to be committed into the current repository!" >&2 echo "Note that the patch needs to be committed into the current repository!"
launch_user_shell launch_user_shell