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

Merge branch 'da/difftool-test'

Browse Source 
Makes sure "difftool" options can be given in any order.

By David Aguilar
* da/difftool-test:
  t7800: Test difftool passing arguments to diff
This commit is contained in:
Junio C Hamano 2012-04-15 22:52:04 -07:00
commit b22d301b24
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 &&