[PATCH 12/9 v5] t7800: add tests for difftool --dir-diff
From: Tim Henigan <hidden>
Date: 2016-06-15 22:53:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Tim Henigan <redacted> --- This replaces 12/9 in the previous version of the series. Changes in v5: Based on an example provided by David Aguilar on the Git developer list, the 'difftool --dir-diff from subdirectory' test is now wrapped in parentheses "()".
From David's email: If we wrap the subdir operations in parentheses, then the sub-shell saves us from having to do "cd ..". It also helps prevent leakage from earlier failures, which is helpful when writing new tests.
t/t7800-difftool.sh | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 41d8399..5f3ad3f 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh@@ -311,4 +311,43 @@ 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 + ) +' + test_done
--
1.7.10.rc1.40.g756bbcd