diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4067-diff-partial-clone.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t4067-diff-partial-clone.sh')
-rwxr-xr-x | third_party/git/t/t4067-diff-partial-clone.sh | 182 |
1 files changed, 0 insertions, 182 deletions
diff --git a/third_party/git/t/t4067-diff-partial-clone.sh b/third_party/git/t/t4067-diff-partial-clone.sh deleted file mode 100755 index 804f2a82e831..000000000000 --- a/third_party/git/t/t4067-diff-partial-clone.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/bin/sh - -test_description='behavior of diff when reading objects in a partial clone' - -. ./test-lib.sh - -test_expect_success 'git show batches blobs' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - echo b >server/b && - git -C server add a b && - git -C server commit -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - # 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 show HEAD && - grep "fetch> done" trace >done_lines && - test_line_count = 1 done_lines -' - -test_expect_success 'diff batches blobs' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - echo b >server/b && - git -C server add a b && - git -C server commit -m x && - echo c >server/c && - echo d >server/d && - git -C server add c d && - git -C server commit -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - # 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 HEAD^ HEAD && - grep "fetch> done" trace >done_lines && - test_line_count = 1 done_lines -' - -test_expect_success 'diff skips same-OID blobs' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - echo b >server/b && - git -C server add a b && - git -C server commit -m x && - echo another-a >server/a && - git -C server add a && - git -C server commit -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - echo a | git hash-object --stdin >hash-old-a && - echo another-a | git hash-object --stdin >hash-new-a && - echo b | git hash-object --stdin >hash-b && - - # Ensure that only a and another-a are fetched. - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD && - grep "want $(cat hash-old-a)" trace && - grep "want $(cat hash-new-a)" trace && - ! grep "want $(cat hash-b)" trace -' - -test_expect_success 'when fetching missing objects, diff skips GITLINKs' ' - test_when_finished "rm -rf sub server client trace" && - - test_create_repo sub && - test_commit -C sub first && - - test_create_repo server && - echo a >server/a && - git -C server add a && - git -C server submodule add "file://$(pwd)/sub" && - git -C server commit -m x && - - test_commit -C server/sub second && - echo another-a >server/a && - git -C server add a sub && - git -C server commit -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - echo a | git hash-object --stdin >hash-old-a && - echo another-a | git hash-object --stdin >hash-new-a && - - # Ensure that a and another-a are fetched, and check (by successful - # execution of the diff) that no invalid OIDs are sent. - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD && - grep "want $(cat hash-old-a)" trace && - grep "want $(cat hash-new-a)" trace -' - -test_expect_success 'diff with rename detection batches blobs' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - printf "b\nb\nb\nb\nb\n" >server/b && - git -C server add a b && - git -C server commit -m x && - rm server/b && - printf "b\nb\nb\nb\nbX\n" >server/c && - git -C server add c && - git -C server commit -a -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - # 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 --raw -M HEAD^ HEAD >out && - grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out && - grep "fetch> done" trace >done_lines && - test_line_count = 1 done_lines -' - -test_expect_success 'diff does not fetch anything if inexact rename detection is not needed' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - printf "b\nb\nb\nb\nb\n" >server/b && - git -C server add a b && - git -C server commit -m x && - mv server/b server/c && - git -C server add c && - git -C server commit -a -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - # Ensure no fetches. - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && - ! test_path_exists trace -' - -test_expect_success 'diff --break-rewrites fetches only if necessary, and batches blobs if it does' ' - test_when_finished "rm -rf server client trace" && - - test_create_repo server && - echo a >server/a && - printf "b\nb\nb\nb\nb\n" >server/b && - git -C server add a b && - git -C server commit -m x && - printf "c\nc\nc\nc\nc\n" >server/b && - git -C server commit -a -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - # Ensure no fetches. - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD && - ! test_path_exists trace && - - # But with --break-rewrites, 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 --break-rewrites --raw -M HEAD^ HEAD && - grep "fetch> done" trace >done_lines && - test_line_count = 1 done_lines -' - -test_done |