* [PATCH] t7800: Test difftool passing arguments to diff
@ 2012-03-17 3:54 David Aguilar
0 siblings, 0 replies; only message in thread
From: David Aguilar @ 2012-03-17 3:54 UTC (permalink / raw
To: Tim Henigan, Junio C Hamano; +Cc: git
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>
---
t/t7800-difftool.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 4fb4c93..2763d79 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 &&
--
1.7.10.rc1.22.gf5241.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-17 3:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-17 3:54 [PATCH] t7800: Test difftool passing arguments to diff David Aguilar
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).