diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:36 -0700 |
| commit | 09dcde9ddd1ffd2e3d0a889d6bbc798db2c6770c (patch) | |
| tree | 4a4ba2ee6547a49967e527ec6cfed64591f30a6c /t | |
| parent | Merge branch 'gp/hppa-stack-test-fix' (diff) | |
| parent | t4067: make rename detection test output raw diff (diff) | |
| download | tgif-09dcde9ddd1ffd2e3d0a889d6bbc798db2c6770c.tar.xz | |
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-x | t/t4067-diff-partial-clone.sh | 4 |
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 ' |