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 <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 14, 2013 at 17:27 UTC
0597ffa5ecff1b83f384357ab88afaf21838caa2
1 file changed
+2
-2
git-rebase--am.sh
+2
-2
@@ -31,8 +31,8 @@ else
31
rm -f "$GIT_DIR/rebased-patches"
32
33
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"
36
ret=$?
37
38
if test 0 != $ret