diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:52:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:52:04 -0700 |
| commit | b22d301b24b55dc59549833d285decbdd9b1ca53 (patch) | |
| tree | 2841295804d56eb193bc8f2bb3aac628fe3b577d /t | |
| parent | Merge branch 'zj/test-cred-helper-nicer-prove' (diff) | |
| parent | t7800: Test difftool passing arguments to diff (diff) | |
| download | tgif-b22d301b24b55dc59549833d285decbdd9b1ca53.tar.xz | |
Merge branch 'da/difftool-test'
Makes sure "difftool" options can be given in any order.
By David Aguilar
* da/difftool-test:
t7800: Test difftool passing arguments to diff
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 4fb4c9384a..2763d795f0 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -83,6 +83,17 @@ test_expect_success PERL 'difftool ignores bad --tool values' ' test "$diff" = "" ' +test_expect_success PERL 'difftool forwards arguments to diff' ' + >for-diff && + git add for-diff && + echo changes>for-diff && + git add for-diff && + diff=$(git difftool --cached --no-prompt -- for-diff) && + test "$diff" = "" && + git reset -- for-diff && + rm for-diff +' + test_expect_success PERL 'difftool honors --gui' ' git config merge.tool bogus-tool && git config diff.tool bogus-tool && |