mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-02 22:24:26 +00:00
Ports: Don't mangle patches when requiring manual edits
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:
parent
ce5a939148
commit
fb049d6913
|
@ -836,7 +836,7 @@ do_dev() {
|
|||
else
|
||||
# The patch didn't apply, oh no!
|
||||
# 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 "Note that the patch needs to be committed into the current repository!"
|
||||
launch_user_shell
|
||||
|
|
Loading…
Reference in a new issue