Merge git://repo.or.cz/git-gui

diff --git a/git-send-email.perl b/git-send-email.perl
index 248d0350880c17fdcf7cf92afc392bc05dc47825..e47994afc4d6a1dd92c84706dea1b77c1b832114 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -400,7 +400,7 @@ sub expand_aliases {
        close(C);
 
        my $editor = $ENV{GIT_EDITOR} || $repo->config("core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
-       system($editor, $compose_filename);
+       system('sh', '-c', '$0 $@', $editor, $compose_filename);
 
        open(C2,">",$compose_filename . ".final")
                or die "Failed to open $compose_filename.final : " . $!;