merge-one-file: fix broken merges with alternate work trees

diff --git a/git-send-email.perl b/git-send-email.perl
index e05455f74c7e23c28cae41b68fa80df87c633ce9..1b99f40390ab62102cfb0aeaba5303c9c6904930 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -162,9 +162,12 @@ sub format_2822_time {
 
 # Handle interactive edition of files.
 my $multiedit;
-my $editor = Git::command_oneline('var', 'GIT_EDITOR');
+my $editor;
 
 sub do_edit {
+       if (!defined($editor)) {
+               $editor = Git::command_oneline('var', 'GIT_EDITOR');
+       }
        if (defined($multiedit) && !$multiedit) {
                map {
                        system('sh', '-c', $editor.' "$@"', $editor, $_);