Instead of running 'grep', 'echo', and 'wc' we simply compare
git-difftool's output against a known good value.
Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
---
This is unchanged from v1 but is included in the series
for completeness.
These all apply to 'next', specifically the da/difftool branch.
t/t7800-difftool.sh | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 8ee186a..1d9e07b 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -15,6 +15,9 @@ if ! test_have_prereq PERL; then
test_done
fi
+LF='
+'
+
remove_config_vars()
{
# Unset all config variables used by git-difftool
@@ -219,19 +222,13 @@ test_expect_success 'difftool.<tool>.path' '
restore_test_defaults
'
-test_expect_success 'difftool --extcmd=...' '
+test_expect_success 'difftool --extcmd=cat' '
diff=$(git difftool --no-prompt --extcmd=cat branch) &&
+ test "$diff" = branch"$LF"master
- lines=$(echo "$diff" | wc -l) &&
- test "$lines" -eq 2 &&
- lines=$(echo "$diff" | grep master | wc -l) &&
- test "$lines" -eq 1 &&
- lines=$(echo "$diff" | grep branch | wc -l) &&
- test "$lines" -eq 1 &&
- restore_test_defaults
'
test_done
--
1.6.6.6.g627fb.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html