[PATCH v3 12/9] t7800: add tests for difftool --dir-diff

From

Tim Henigan <tim.henigan@gmail.com>

Date

Mar 21, 2012, 19:36 UTC

Message-ID

<1332358560-13774-6-git-send-email-tim.henigan@gmail.com>

In-Reply-To

<1332358560-13774-1-git-send-email-tim.henigan@gmail.com>

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---
 t/t7800-difftool.sh |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 663247c..fca49d1 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -305,4 +305,42 @@ test_expect_success PERL 'difftool --tool-help' '
 	echo "$tool_help" | stdin_contains tool
 '
 
+test_expect_success PERL 'setup change in subdirectory' '
+	git checkout master &&
+	mkdir sub &&
+	echo master >sub/sub &&
+	git add sub/sub &&
+	git commit -m "added sub/sub" &&
+	echo test >>file &&
+	echo test >>sub/sub &&
+	git add . &&
+	git commit -m "modified both"
+'
+
+test_expect_success PERL 'difftool -d' '
+	diff=$(git difftool -d --extcmd ls branch) &&
+	echo "$diff" | stdin_contains sub &&
+	echo "$diff" | stdin_contains file
+'
+
+test_expect_success PERL 'difftool --dir-diff' '
+	diff=$(git difftool --dir-diff --extcmd ls branch) &&
+	echo "$diff" | stdin_contains sub &&
+	echo "$diff" | stdin_contains file
+'
+
+test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
+	diff=$(git difftool --dir-diff --prompt --extcmd ls branch) &&
+	echo "$diff" | stdin_contains sub &&
+	echo "$diff" | stdin_contains file
+'
+
+test_expect_success PERL 'difftool --dir-diff from subdirectory' '
+	cd sub &&
+	diff=$(git difftool --dir-diff --extcmd ls branch) &&
+	echo "$diff" | stdin_contains sub &&
+	echo "$diff" | stdin_contains file &&
+	cd ..
+'
+
 test_done

-- 
1.7.10.rc1.39.g6e141f