1 files changed, 4 insertions, 1 deletions

diff --git a/git-send-email.perl b/git-send-email.perl
index 33bcfb4e76..ce569a9c8f 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -166,9 +166,12 @@ my $compose_filename;
 
 # 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, $_);