development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

t7800: Test difftool passing arguments to diff

Browse source 
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>
This commit is contained in:
David Aguilar 2012-03-16 20:54:37 -07:00 committed by Junio C Hamano
parent f524129737
commit d50b2c73b6
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
t/t7800-difftool.sh
View file

@ -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 &&