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/t7408-submodule-reference.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/t7408-submodule-reference.sh')
-rwxr-xr-x | third_party/git/t/t7408-submodule-reference.sh | 211 |
1 files changed, 0 insertions, 211 deletions
diff --git a/third_party/git/t/t7408-submodule-reference.sh b/third_party/git/t/t7408-submodule-reference.sh deleted file mode 100755 index a3892f494b68..000000000000 --- a/third_party/git/t/t7408-submodule-reference.sh +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2009, Red Hat Inc, Author: Michael S. Tsirkin (mst@redhat.com) -# - -test_description='test clone --reference' -. ./test-lib.sh - -base_dir=$(pwd) - -test_alternate_is_used () { - alternates_file="$1" && - working_dir="$2" && - test_line_count = 1 "$alternates_file" && - echo "0 objects, 0 kilobytes" >expect && - git -C "$working_dir" count-objects >actual && - test_cmp expect actual -} - -test_expect_success 'preparing first repository' ' - test_create_repo A && - ( - cd A && - echo first >file1 && - git add file1 && - git commit -m A-initial - ) -' - -test_expect_success 'preparing second repository' ' - git clone A B && - ( - cd B && - echo second >file2 && - git add file2 && - git commit -m B-addition && - git repack -a -d && - git prune - ) -' - -test_expect_success 'preparing superproject' ' - test_create_repo super && - ( - cd super && - echo file >file && - git add file && - git commit -m B-super-initial - ) -' - -test_expect_success 'submodule add --reference uses alternates' ' - ( - cd super && - git submodule add --reference ../B "file://$base_dir/A" sub && - git commit -m B-super-added && - git repack -ad - ) && - test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub -' - -test_expect_success 'submodule add --reference with --dissociate does not use alternates' ' - ( - cd super && - git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate && - git commit -m B-super-added && - git repack -ad - ) && - test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates -' - -test_expect_success 'that reference gets used with add' ' - ( - cd super/sub && - echo "0 objects, 0 kilobytes" >expected && - git count-objects >current && - diff expected current - ) -' - -# The tests up to this point, and repositories created by them -# (A, B, super and super/sub), are about setting up the stage -# for subsequent tests and meant to be kept throughout the -# remainder of the test. -# Tests from here on, if they create their own test repository, -# are expected to clean after themselves. - -test_expect_success 'updating superproject keeps alternates' ' - test_when_finished "rm -rf super-clone" && - git clone super super-clone && - git -C super-clone submodule update --init --reference ../B && - test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub -' - -test_expect_success 'updating superproject with --dissociate does not keep alternates' ' - test_when_finished "rm -rf super-clone" && - git clone super super-clone && - git -C super-clone submodule update --init --reference ../B --dissociate && - test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates -' - -test_expect_success 'submodules use alternates when cloning a superproject' ' - test_when_finished "rm -rf super-clone" && - git clone --reference super --recursive super super-clone && - ( - cd super-clone && - # test superproject has alternates setup correctly - test_alternate_is_used .git/objects/info/alternates . && - # test submodule has correct setup - test_alternate_is_used .git/modules/sub/objects/info/alternates sub - ) -' - -test_expect_success 'missing submodule alternate fails clone and submodule update' ' - test_when_finished "rm -rf super-clone" && - git clone super super2 && - test_must_fail git clone --recursive --reference super2 super2 super-clone && - ( - cd super-clone && - # test superproject has alternates setup correctly - test_alternate_is_used .git/objects/info/alternates . && - # update of the submodule succeeds - test_must_fail git submodule update --init && - # and we have no alternates: - test_path_is_missing .git/modules/sub/objects/info/alternates && - test_path_is_missing sub/file1 - ) -' - -test_expect_success 'ignoring missing submodule alternates passes clone and submodule update' ' - test_when_finished "rm -rf super-clone" && - git clone --reference-if-able super2 --recursive super2 super-clone && - ( - cd super-clone && - # test superproject has alternates setup correctly - test_alternate_is_used .git/objects/info/alternates . && - # update of the submodule succeeds - git submodule update --init && - # and we have no alternates: - test_path_is_missing .git/modules/sub/objects/info/alternates && - test_path_is_file sub/file1 - ) -' - -test_expect_success 'preparing second superproject with a nested submodule plus partial clone' ' - test_create_repo supersuper && - ( - cd supersuper && - echo "I am super super." >file && - git add file && - git commit -m B-super-super-initial && - git submodule add "file://$base_dir/super" subwithsub && - git commit -m B-super-super-added && - git submodule update --init --recursive && - git repack -ad - ) && - git clone supersuper supersuper2 && - ( - cd supersuper2 && - git submodule update --init - ) -' - -# At this point there are three root-level positories: A, B, super and super2 - -test_expect_success 'nested submodule alternate in works and is actually used' ' - test_when_finished "rm -rf supersuper-clone" && - git clone --recursive --reference supersuper supersuper supersuper-clone && - ( - cd supersuper-clone && - # test superproject has alternates setup correctly - test_alternate_is_used .git/objects/info/alternates . && - # immediate submodule has alternate: - test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub && - # nested submodule also has alternate: - test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub - ) -' - -check_that_two_of_three_alternates_are_used() { - test_alternate_is_used .git/objects/info/alternates . && - # immediate submodule has alternate: - test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub && - # but nested submodule has no alternate: - test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates -} - - -test_expect_success 'missing nested submodule alternate fails clone and submodule update' ' - test_when_finished "rm -rf supersuper-clone" && - test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone && - ( - cd supersuper-clone && - check_that_two_of_three_alternates_are_used && - # update of the submodule fails - test_must_fail git submodule update --init --recursive - ) -' - -test_expect_success 'missing nested submodule alternate in --reference-if-able mode' ' - test_when_finished "rm -rf supersuper-clone" && - git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone && - ( - cd supersuper-clone && - check_that_two_of_three_alternates_are_used && - # update of the submodule succeeds - git submodule update --init --recursive - ) -' - -test_done |