X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-difftool.perl;h=adc42de8752fd395707f1e395c61991b3146cebb;hb=7ea3ddf818dbd59ae8002e98f56e60742746db45;hp=d975d072dbf0fab36266c3f3a71a69875206e4d8;hpb=c2b456b8956c2091318edaee362119e0e96b86b7;p=git.git

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') {