Skip to content

Commit 0597ffa

Browse files
felipecgitster
authored andcommitted
rebase-am: explicitly disable cover-letter
If the user has a cover-letter configuration set to anything other than 'false', 'git format-patch' may generate a cover letter, which has no place in "format-patch | am" pipeline. The internal invocation of format-patch must explicitly override the configuration from the command line, just like --src-prefix and other options already do. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d7ddad0 commit 0597ffa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-rebase--am.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ else
3131
rm -f "$GIT_DIR/rebased-patches"
3232

3333
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
34-
--src-prefix=a/ --dst-prefix=b/ \
35-
--no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches"
34+
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
35+
$root_flag "$revisions" >"$GIT_DIR/rebased-patches"
3636
ret=$?
3737

3838
if test 0 != $ret

0 commit comments

Comments
 (0)