From: Gustaf Hendeby <hendeby@isy.liu.se>
Date: Mon, 21 Jan 2008 19:57:46 +0000 (+0100)
Subject: send-email, fix breakage in combination with --compose
X-Git-Tag: v1.5.4-rc5~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97394ee4304a8d336663df5da23a33efbe1ab46b;p=git.git

send-email, fix breakage in combination with --compose

This fixes the subtile bug in git send-email that was introduced into
git send-email with aa54892f5ada8282643dc7387b33261c7135d784 (send-email:
detect invocation errors earlier), which caused no patches to be sent
out if the --compose flag was used.

Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Tested-by: Seth Falcon <seth@userprimary.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-send-email.perl b/git-send-email.perl
index 6c72952fc..a1a9d14b0 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -462,7 +462,7 @@ EOT
 		exit(0);
 	}
 
-	@files = ($compose_filename . ".final");
+	@files = ($compose_filename . ".final", @files);
 }
 
 # Variables we set as part of the loop over files