From 850896042a42c1c16912a3981ca844e2cbcd14d4 Mon Sep 17 00:00:00 2001 From: Tim Henigan Date: Thu, 22 Mar 2012 15:52:17 -0400 Subject: difftool: add '--no-gui' option This commit teaches difftool to handle the '--no-gui' option. This option negates the existing '--gui' option. The last setting given on the command line wins. This allows a user to configure "[alias] mdt = difftool --gui", but still have the ability to override the setting without error: $ git mdt --no-gui Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano --- git-difftool.perl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'git-difftool.perl') diff --git a/git-difftool.perl b/git-difftool.perl index bade735cc1..93e84e8d3d 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,7 +22,8 @@ sub usage { print << 'USAGE'; usage: git difftool [-t|--tool=] - [-x|--extcmd=] [-g|--gui] + [-x|--extcmd=] + [-g|--gui] [--no-gui] [--prompt] [-y|--no-prompt] ['git diff' options] USAGE @@ -49,7 +50,7 @@ sub exe # parse command-line options. all unrecognized options and arguments # are passed through to the 'git diff' command. my ($difftool_cmd, $extcmd, $gui, $help, $prompt); -GetOptions('g|gui' => \$gui, +GetOptions('g|gui!' => \$gui, 'h' => \$help, 'prompt!' => \$prompt, 'y' => sub { $prompt = 0; }, @@ -75,7 +76,7 @@ if (defined($extcmd)) { usage(); } } -if (defined($gui)) { +if ($gui) { my $guitool = ""; $guitool = Git::config('diff.guitool'); if (length($guitool) > 0) { -- cgit v1.2.3