diff options
| author | Tim Henigan <tim.henigan@gmail.com> | 2012-03-22 19:52:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-23 18:46:25 (GMT) |
| commit | 850896042a42c1c16912a3981ca844e2cbcd14d4 (patch) | |
| tree | f38da913cd54a31969bff0381abbbc12642b8249 /t/t7800-difftool.sh | |
| parent | 3f94ff755e266520ba2f6007d557395c33d30fdc (diff) | |
| download | git-850896042a42c1c16912a3981ca844e2cbcd14d4.zip git-850896042a42c1c16912a3981ca844e2cbcd14d4.tar.gz git-850896042a42c1c16912a3981ca844e2cbcd14d4.tar.bz2 | |
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 4fb4c93..e716d06 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -94,6 +94,19 @@ test_expect_success PERL 'difftool honors --gui' ' 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' ' git config diff.tool test-tool && |