diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-14 17:27:04 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-14 20:01:07 -0700 |
| commit | 0597ffa5ecff1b83f384357ab88afaf21838caa2 (patch) | |
| tree | 7b87e05ecb6683f859d5946e08bfe0ef5f0a446c | |
| parent | d7ddad012b1badaf96075e880d546ef3525f23ff (diff) | |
| download | git-0597ffa5ecff1b83f384357ab88afaf21838caa2.tar.gz | |
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>
| -rw-r--r-- | git-rebase--am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 97f31dc7af..f84854f09a 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -31,8 +31,8 @@ else rm -f "$GIT_DIR/rebased-patches" git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - --src-prefix=a/ --dst-prefix=b/ \ - --no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches" + --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ + $root_flag "$revisions" >"$GIT_DIR/rebased-patches" ret=$? if test 0 != $ret |