From fb049d691390d3fcf8181f68e37afd74fbf72dfe Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 19 Apr 2023 04:36:30 +0200 Subject: [PATCH] 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. --- Ports/.port_include.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh index ee719ee916..15d188c2b2 100755 --- a/Ports/.port_include.sh +++ b/Ports/.port_include.sh @@ -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