Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-25 05:39:35 +0300
committerJunio C Hamano <gitster@pobox.com>2020-05-25 05:39:36 +0300
commit09dcde9ddd1ffd2e3d0a889d6bbc798db2c6770c (patch)
tree4a4ba2ee6547a49967e527ec6cfed64591f30a6c /t
parentdf0a5e4eace3c26c78a79f517e4670e78f680209 (diff)
parent293194c9f9b03d84f327067888ee0a747109d61c (diff)
Merge branch 'jt/avoid-prefetch-when-able-in-diff'
Test-coverage enhancement. * jt/avoid-prefetch-when-able-in-diff: t4067: make rename detection test output raw diff
Diffstat (limited to 't')
-rwxr-xr-xt/t4067-diff-partial-clone.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
index c1ed1c2fc4..ef8e0e9cb0 100755
--- a/t/t4067-diff-partial-clone.sh
+++ b/t/t4067-diff-partial-clone.sh
@@ -125,8 +125,8 @@ test_expect_success 'diff with rename detection batches blobs' '
# Ensure that there is exactly 1 negotiation by checking that there is
# only 1 "done" line sent. ("done" marks the end of negotiation.)
- GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff -M HEAD^ HEAD >out &&
- grep "similarity index" out &&
+ GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
+ grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
grep "git> done" trace >done_lines &&
test_line_count = 1 done_lines
'