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

hendeby · gitster · commit 97394ee4304a · 2008-01-21T17:24:12.000-08:00
This fixes the subtile bug in git send-email that was introduced into git send-email with aa54892 (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
@@ -462,7 +462,7 @@ sub expand_aliases {
 		exit(0);
 	}
 
-	@files = ($compose_filename . ".final");
+	@files = ($compose_filename . ".final", @files);
 }
 
 # Variables we set as part of the loop over files

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ sub expand_aliases {`
`462`	`462`	`exit(0);`
`463`	`463`	`}`
`464`	`464`
`465`		`- @files = ($compose_filename . ".final");`
	`465`	`+ @files = ($compose_filename . ".final", @files);`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`# Variables we set as part of the loop over files`