diff options
| author | Eric Wong <e@80x24.org> | 2017-11-18 01:01:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-18 12:30:16 +0900 |
| commit | ae3b2b04bb88c8bbb298ceb5be634a3c0ba92159 (patch) | |
| tree | d66bf94db6542255220fc460b1ad449c7dac2f9d /git-rebase--am.sh | |
| parent | 5a1f5c3060427375de30d609d72ac032516be4c2 (diff) | |
| download | git-ae3b2b04bb88c8bbb298ceb5be634a3c0ba92159.tar.gz git-ae3b2b04bb88c8bbb298ceb5be634a3c0ba92159.tar.xz | |
rebase: use mboxrd format to avoid split errors
The mboxrd format allows the use of embedded "From " lines in
commit messages without being misinterpreted by mailsplit
Reported-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--am.sh')
| -rw-r--r-- | git-rebase--am.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 6e64d40d6..14c50782e 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=$? |