diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-28 17:42:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 17:42:58 -0700 |
| commit | faf752693abd0a891a9a47a2d398353cc59ee93a (patch) | |
| tree | c68e63b1a514e4a8fe334cc86a8cf36fe3571673 /git-difftool.perl | |
| parent | 10439d89ebe77a1fb8f05a8ad5d5f4071639bb3e (diff) | |
| parent | 4c367c6ae978ef18477fba6b00458c32f1d49d0d (diff) | |
| download | git-faf752693abd0a891a9a47a2d398353cc59ee93a.tar.gz git-faf752693abd0a891a9a47a2d398353cc59ee93a.tar.xz | |
Merge branch 'maint'
* maint:
t9350: fix careless use of "cd"
difftool: Fix '--gui' when diff.guitool is unconfigured
fast-export: don't segfault when marks file cannot be opened
Diffstat (limited to 'git-difftool.perl')
| -rwxr-xr-x | git-difftool.perl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index d975d072d..adc42de87 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -78,11 +78,13 @@ sub generate_command next; } if ($arg eq '-g' || $arg eq '--gui') { - my $tool = Git::command_oneline('config', - 'diff.guitool'); - if (length($tool)) { - $ENV{GIT_DIFF_TOOL} = $tool; - } + eval { + my $tool = Git::command_oneline('config', + 'diff.guitool'); + if (length($tool)) { + $ENV{GIT_DIFF_TOOL} = $tool; + } + }; next; } if ($arg eq '-y' || $arg eq '--no-prompt') { |