diff options
| author | David Aguilar <davvid@gmail.com> | 2012-03-16 20:54:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-19 09:41:34 -0700 |
| commit | d50b2c73b6ffcdc9a55efa38542d02773df44407 (patch) | |
| tree | 6a37211b0ea168a953dfc2cf021b600a9f56ba1e /t/t7800-difftool.sh | |
| parent | f524129737d9ba3e685c31bacde844ec1db1fea9 (diff) | |
| download | git-d50b2c73b6ffcdc9a55efa38542d02773df44407.tar.gz | |
t7800: Test difftool passing arguments to diffda/difftool-test
git-difftool relies on the ability to forward unknown arguments
to the git-diff command. Add a test to ensure that this works
as advertised.
Signed-off-by: David Aguilar <davvid@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 | 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 && |