If you have a cover-letter configuration set to anything other than
'false', 'git format-patch' might generate a cover letter, and 'git am'
doesn't seem to like that.

Ideally 'git am' should skip the cover-letter, but for now lets just fix
the regression.

Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
 git-rebase--am.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 97f31dc..f84854f 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"
        if test 0 != $ret

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to