Re: Special strings in commit messages
From: Florian Weimer <hidden>
Date: 2017-10-09 13:38:21
On 10/08/2017 11:30 PM, Eric Wong wrote:
quoted hunk ↗ jump to hunk
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 6e64d40d6f..14c50782e0 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh@@ -53,6 +53,7 @@ else git format-patch -k --stdout --full-index --cherry-pick --right-only \ --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ + --pretty=mboxrd \ $git_format_patch_opt \ "$revisions" ${restrict_revision+^$restrict_revision} \ >"$GIT_DIR/rebased-patches"@@ -83,6 +84,7 @@ else fi git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ + --patch-format=mboxrd \ $allow_rerere_autoupdate \ ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches" ret=$?
My context is slightly different, but I added the mboxrd options manually to both commands, and it fixes my test case. I'm still wondering if I have to be on the lookout for similar issues with different strings. Thanks, Florian