]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.35.5
authorTaylor Blau <me@ttaylorr.com>
Thu, 6 Oct 2022 21:44:44 +0000 (17:44 -0400)
committerTaylor Blau <me@ttaylorr.com>
Thu, 6 Oct 2022 21:44:44 +0000 (17:44 -0400)
Signed-off-by: Taylor Blau <me@ttaylorr.com>
16 files changed:
1  2 
builtin/clone.c
t/t1091-sparse-checkout-builtin.sh
t/t1092-sparse-checkout-compatibility.sh
t/t2400-worktree-add.sh
t/t3200-branch.sh
t/t5510-fetch.sh
t/t5526-fetch-submodules.sh
t/t5601-clone.sh
t/t5616-partial-clone.sh
t/t5617-clone-submodules-remote.sh
t/t7001-mv.sh
t/t7406-submodule-update.sh
t/t7408-submodule-reference.sh
t/t7814-grep-recurse-submodules.sh
t/t9350-fast-export.sh
transport.c

diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 43dada854443dcf430439dffd6d38d5d5be4f3d0,93a98e1ef004c9dff5aedc35b59600801b8b4354..072c3216df29664bb5eefc0831662bdd13352529
@@@ -73,60 -37,8 +73,61 @@@ add_submodule_commits () 
        )
  }
  
 +# For each superproject in the test setup, update its submodule, add the
 +# submodule and create a new commit with the submodule change.
 +#
 +# This requires add_submodule_commits() to be called first, otherwise
 +# the submodules will not have changed and cannot be "git add"-ed.
 +add_superproject_commits () {
 +      (
 +              cd submodule &&
 +              (
 +                      cd subdir/deepsubmodule &&
 +                      git fetch &&
 +                      git checkout -q FETCH_HEAD
 +              ) &&
 +              git add subdir/deepsubmodule &&
 +              git commit -m "new deep submodule"
 +      ) &&
 +      git add submodule &&
 +      git commit -m "new submodule" &&
 +      super_head=$(git rev-parse --short HEAD) &&
 +      sub_head=$(git -C submodule rev-parse --short HEAD) &&
 +      write_expected_super $super_head &&
 +      write_expected_sub $sub_head
 +}
 +
 +# Verifies that the expected repositories were fetched. This is done by
 +# concatenating the files expect.err.[super|sub|deep] in the correct
 +# order and comparing it to the actual stderr.
 +#
 +# If a repo should not be fetched in the test, its corresponding
 +# expect.err file should be rm-ed.
 +verify_fetch_result () {
 +      ACTUAL_ERR=$1 &&
 +      rm -f expect.err.combined &&
 +      if test -f expect.err.super
 +      then
 +              cat expect.err.super >>expect.err.combined
 +      fi &&
 +      if test -f expect.err.sub
 +      then
 +              cat expect.err.sub >>expect.err.combined
 +      fi &&
 +      if test -f expect.err.deep
 +      then
 +              cat expect.err.deep >>expect.err.combined
 +      fi &&
 +      if test -f expect.err.sub2
 +      then
 +              cat expect.err.sub2 >>expect.err.combined
 +      fi &&
 +      sed -e 's/[0-9a-f][0-9a-f]*\.\./OLD_HEAD\.\./' "$ACTUAL_ERR" >actual.err.cmp &&
 +      test_cmp expect.err.combined actual.err.cmp
 +}
 +
  test_expect_success setup '
+       git config --global protocol.file.allow always &&
        mkdir deepsubmodule &&
        (
                cd deepsubmodule &&
Simple merge
Simple merge
Simple merge
diff --cc t/t7001-mv.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc transport.c
Simple merge