{"thread":{"id":"29972","subject":"[PATCH] t7800: Test difftool passing arguments to diff","startedAt":"2012-03-17T03:54:37Z","lastAt":"2012-03-17T03:54:37Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"187132","messageId":"1331956477-61346-1-git-send-email-davvid@gmail.com","threadId":"29972","inReplyTo":null,"subject":"[PATCH] t7800: Test difftool passing arguments to diff","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2012-03-17T03:54:37Z","receivedAt":"2012-03-17T03:54:37Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"git-difftool relies on the ability to forward unknown arguments\nto the git-diff command.  Add a test to ensure that this works\nas advertised.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n t/t7800-difftool.sh |   11 +++++++++++\n 1 file changed, 11 insertions(+)\n\ndiff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh\nindex 4fb4c93..2763d79 100755\n--- a/t/t7800-difftool.sh\n+++ b/t/t7800-difftool.sh\n@@ -83,6 +83,17 @@ test_expect_success PERL 'difftool ignores bad --tool values' '\n \ttest \"$diff\" = \"\"\n '\n \n+test_expect_success PERL 'difftool forwards arguments to diff' '\n+\t>for-diff &&\n+\tgit add for-diff &&\n+\techo changes>for-diff &&\n+\tgit add for-diff &&\n+\tdiff=$(git difftool --cached --no-prompt -- for-diff) &&\n+\ttest \"$diff\" = \"\" &&\n+\tgit reset -- for-diff &&\n+\trm for-diff\n+'\n+\n test_expect_success PERL 'difftool honors --gui' '\n \tgit config merge.tool bogus-tool &&\n \tgit config diff.tool bogus-tool &&\n-- \n1.7.10.rc1.22.gf5241.dirty\n"}]}