Merge branch 'sg/clean-nested-repo-with-ignored'

diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 6415063980b49985b25d351f5c0079f44ad92533..d4b7e535ea134569ed8bf5643edf8d435a22bc1a 100755 (executable)
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -26,7 +26,7 @@ promise_and_delete () {
 test_expect_success 'extensions.partialclone without filter' '
        test_create_repo server &&
        git clone --filter="blob:none" "file://$(pwd)/server" client &&
-       git -C client config --unset core.partialclonefilter &&
+       git -C client config --unset remote.origin.partialclonefilter &&
        git -C client fetch origin
 '
 
@@ -166,8 +166,9 @@ test_expect_success 'fetching of missing objects' '
        # associated packfile contains the object
        ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
        test_line_count = 1 promisorlist &&
-       IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
-       git verify-pack --verbose "$IDX" | grep "$HASH"
+       IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+       git verify-pack --verbose "$IDX" >out &&
+       grep "$HASH" out
 '
 
 test_expect_success 'fetching of missing objects works with ref-in-want enabled' '
@@ -182,8 +183,55 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled'
        grep "git< fetch=.*ref-in-want" trace
 '
 
+test_expect_success 'fetching of missing objects from another promisor remote' '
+       git clone "file://$(pwd)/server" server2 &&
+       test_commit -C server2 bar &&
+       git -C server2 repack -a -d --write-bitmap-index &&
+       HASH2=$(git -C server2 rev-parse bar) &&
+
+       git -C repo remote add server2 "file://$(pwd)/server2" &&
+       git -C repo config remote.server2.promisor true &&
+       git -C repo cat-file -p "$HASH2" &&
+
+       git -C repo fetch server2 &&
+       rm -rf repo/.git/objects/* &&
+       git -C repo cat-file -p "$HASH2" &&
+
+       # Ensure that the .promisor file is written, and check that its
+       # associated packfile contains the object
+       ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+       test_line_count = 1 promisorlist &&
+       IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+       git verify-pack --verbose "$IDX" >out &&
+       grep "$HASH2" out
+'
+
+test_expect_success 'fetching of missing objects configures a promisor remote' '
+       git clone "file://$(pwd)/server" server3 &&
+       test_commit -C server3 baz &&
+       git -C server3 repack -a -d --write-bitmap-index &&
+       HASH3=$(git -C server3 rev-parse baz) &&
+       git -C server3 config uploadpack.allowfilter 1 &&
+
+       rm repo/.git/objects/pack/pack-*.promisor &&
+
+       git -C repo remote add server3 "file://$(pwd)/server3" &&
+       git -C repo fetch --filter="blob:none" server3 $HASH3 &&
+
+       test_cmp_config -C repo true remote.server3.promisor &&
+
+       # Ensure that the .promisor file is written, and check that its
+       # associated packfile contains the object
+       ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+       test_line_count = 1 promisorlist &&
+       IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+       git verify-pack --verbose "$IDX" >out &&
+       grep "$HASH3" out
+'
+
 test_expect_success 'fetching of missing blobs works' '
-       rm -rf server repo &&
+       rm -rf server server2 repo &&
+       rm -rf server server3 repo &&
        test_create_repo server &&
        test_commit -C server foo &&
        git -C server repack -a -d --write-bitmap-index &&
@@ -234,7 +282,7 @@ test_expect_success 'rev-list stops traversal at missing and promised commit' '
 
        git -C repo config core.repositoryformatversion 1 &&
        git -C repo config extensions.partialclone "arbitrary string" &&
-       GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
+       GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
        grep $(git -C repo rev-parse bar) out &&
        ! grep $FOO out
 '
@@ -514,8 +562,9 @@ test_expect_success 'fetching of missing objects from an HTTP server' '
        # associated packfile contains the object
        ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
        test_line_count = 1 promisorlist &&
-       IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
-       git verify-pack --verbose "$IDX" | grep "$HASH"
+       IDX=$(sed "s/promisor$/idx/" promisorlist) &&
+       git verify-pack --verbose "$IDX" >out &&
+       grep "$HASH" out
 '
 
 # DO NOT add non-httpd-specific tests here, because the last part of this