undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: add '--no-gui' option

Browse Source 
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tim Henigan 2012-03-22 15:52:17 -04:00 committed by Junio C Hamano
parent 3f94ff755e
commit 850896042a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-difftool.perl
View File

@ -22,7 +22,8 @@ sub usage
{ {
print << 'USAGE'; print << 'USAGE';
usage: git difftool [-t|--tool=<tool>] usage: git difftool [-t|--tool=<tool>]
[-x|--extcmd=<cmd>] [-g|--gui] [-x|--extcmd=<cmd>]
[-g|--gui] [--no-gui]
[--prompt] [-y|--no-prompt] [--prompt] [-y|--no-prompt]
['git diff' options] ['git diff' options]
USAGE USAGE
@ -49,7 +50,7 @@ sub exe
# parse command-line options. all unrecognized options and arguments # parse command-line options. all unrecognized options and arguments
# are passed through to the 'git diff' command. # are passed through to the 'git diff' command.
my ($difftool_cmd, $extcmd, $gui, $help, $prompt); my ($difftool_cmd, $extcmd, $gui, $help, $prompt);
GetOptions('g|gui' => \$gui, GetOptions('g|gui!' => \$gui,
'h' => \$help, 'h' => \$help,
'prompt!' => \$prompt, 'prompt!' => \$prompt,
'y' => sub { $prompt = 0; }, 'y' => sub { $prompt = 0; },
@ -75,7 +76,7 @@ if (defined($extcmd)) {
usage(); usage();
} }
} }
if (defined($gui)) { if ($gui) {
my $guitool = ""; my $guitool = "";
$guitool = Git::config('diff.guitool'); $guitool = Git::config('diff.guitool');
if (length($guitool) > 0) { if (length($guitool) > 0) {

13
t/t7800-difftool.sh
View File

@ -94,6 +94,19 @@ test_expect_success PERL 'difftool honors --gui' '
restore_test_defaults restore_test_defaults
' '
test_expect_success PERL 'difftool --gui last setting wins' '
git config diff.guitool bogus-tool &&
git difftool --no-prompt --gui --no-gui &&
git config merge.tool bogus-tool &&
git config diff.tool bogus-tool &&
git config diff.guitool test-tool &&
diff=$(git difftool --no-prompt --no-gui --gui branch) &&
test "$diff" = "branch" &&
restore_test_defaults
'
test_expect_success PERL 'difftool --gui works without configured diff.guitool' ' test_expect_success PERL 'difftool --gui works without configured diff.guitool' '
git config diff.tool test-tool && git config diff.tool test-tool &&