From: David Aguilar <davvid@gmail.com>
Date: Sat, 17 Mar 2012 03:54:37 +0000 (-0700)
Subject: t7800: Test difftool passing arguments to diff
X-Git-Tag: v1.7.11-rc0~156^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d50b2c73b6ffcdc9a55efa38542d02773df44407;p=git.git

t7800: Test difftool passing arguments to diff

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

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 4fb4c9384..2763d795f 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 &&