about summary refs log tree commit diff
path: root/third_party/git/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t7800-difftool.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t7800-difftool.sh')
-rwxr-xr-xthird_party/git/t/t7800-difftool.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/git/t/t7800-difftool.sh b/third_party/git/t/t7800-difftool.sh
index 29b92907e2ad..6bac9ed180e7 100755
--- a/third_party/git/t/t7800-difftool.sh
+++ b/third_party/git/t/t7800-difftool.sh
@@ -125,14 +125,15 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
 	test_when_finished "rm -f for-diff .git/fail-right-file" &&
 	test_when_finished "git reset -- for-diff" &&
 	write_script .git/fail-right-file <<-\EOF &&
-	echo failed
+	echo "$2"
 	exit 1
 	EOF
 	>for-diff &&
 	git add for-diff &&
+	echo file >expect &&
 	test_must_fail git difftool -y --trust-exit-code \
 		--extcmd .git/fail-right-file branch >actual &&
-	test_line_count = 1 actual
+	test_cmp expect actual
 '
 
 test_expect_success 'difftool honors exit status if command not found' '