From 0597ffa5ecff1b83f384357ab88afaf21838caa2 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 14 Apr 2013 17:27:04 -0500
Subject: 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>

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"
 	ret=$?
 
 	if test 0 != $ret
-- 
cgit v0.10.2-6-g49f6