diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-12-14 18:27:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 11:13:41 -0800 |
| commit | d531174fe386af00755619d6a204db74a30954f8 (patch) | |
| tree | 2d2a529cc607efa36e81ca415dc99991d926e8c0 | |
| parent | c6d059bbccb8460959b9aedfeefbb4d6aac6e842 (diff) | |
| download | git-d531174fe386af00755619d6a204db74a30954f8.tar.gz | |
difftool: Fix failure on Cygwin
In particular, test 14 'difftool last flag wins' in t7800 fails.
This is caused by git-difftool.perl passing both GIT_DIFFTOOL_NO_PROMPT
(='true') and GIT_DIFFTOOL_PROMPT (='true') to the difftool helper
script. Despite the appropriate key being deleted from the ENV
hash, it seems that once a key has been set in the hash, it gets
passed along to the system() call. (ie deleting the key does not
do the equivalent of unsetenv()).
In order to fix the problem, we keep track of the required prompt
state while processing the arguments, and then set the relevant
ENV hash key only once at the end.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-difftool.perl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index e95e4ad973..ced1615e21 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -52,6 +52,7 @@ sub generate_command my @command = (exe('git'), 'diff'); my $skip_next = 0; my $idx = -1; + my $prompt = ''; for my $arg (@ARGV) { $idx++; if ($skip_next) { @@ -89,13 +90,11 @@ sub generate_command next; } if ($arg eq '-y' || $arg eq '--no-prompt') { - $ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true'; - delete $ENV{GIT_DIFFTOOL_PROMPT}; + $prompt = 'no'; next; } if ($arg eq '--prompt') { - $ENV{GIT_DIFFTOOL_PROMPT} = 'true'; - delete $ENV{GIT_DIFFTOOL_NO_PROMPT}; + $prompt = 'yes'; next; } if ($arg eq '-h' || $arg eq '--help') { @@ -103,6 +102,11 @@ sub generate_command } push @command, $arg; } + if ($prompt eq 'yes') { + $ENV{GIT_DIFFTOOL_PROMPT} = 'true'; + } elsif ($prompt eq 'no') { + $ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true'; + } return @command } |