Merge branch 'pw/am-rebase-read-author-script'

diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index bbbe7537dfd315a567c6dc5583804325e6f10235..336f02a41a66b48269e8eb6030d5323cffb8b686 100755 (executable)
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -34,10 +34,12 @@ test_expect_success 'setup bare clone for server' '
 # confirm partial clone was registered in the local config.
 test_expect_success 'do partial clone 1' '
        git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
-       git -C pc1 rev-list HEAD --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
+       awk -f print_1.awk revs |
+       sed "s/?//" |
+       sort >observed.oids &&
+
        test_cmp expect_1.oids observed.oids &&
        test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
        test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
@@ -46,10 +48,10 @@ test_expect_success 'do partial clone 1' '
 
 # checkout master to force dynamic object fetch of blobs at HEAD.
 test_expect_success 'verify checkout with dynamic object fetch' '
-       git -C pc1 rev-list HEAD --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
        test_line_count = 4 observed &&
        git -C pc1 checkout master &&
-       git -C pc1 rev-list HEAD --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
        test_line_count = 0 observed
 '
 
@@ -72,7 +74,8 @@ test_expect_success 'push new commits to server' '
 # have the new blobs.
 test_expect_success 'partial fetch inherits filter settings' '
        git -C pc1 fetch origin &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print \
+               master..origin/master >observed &&
        test_line_count = 5 observed
 '
 
@@ -80,7 +83,8 @@ test_expect_success 'partial fetch inherits filter settings' '
 # we should only get 1 new blob (for the file in origin/master).
 test_expect_success 'verify diff causes dynamic object fetch' '
        git -C pc1 diff master..origin/master -- file.1.txt &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print \
+                master..origin/master >observed &&
        test_line_count = 4 observed
 '
 
@@ -89,7 +93,8 @@ test_expect_success 'verify diff causes dynamic object fetch' '
 test_expect_success 'verify blame causes dynamic object fetch' '
        git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
        test_cmp expect.blame observed.blame &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print \
+               master..origin/master >observed &&
        test_line_count = 0 observed
 '
 
@@ -109,7 +114,8 @@ test_expect_success 'push new commits to server for file.2.txt' '
 # Verify we have all the new blobs.
 test_expect_success 'override inherited filter-spec using --no-filter' '
        git -C pc1 fetch --no-filter origin &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print >observed &&
+       git -C pc1 rev-list --quiet --objects --missing=print \
+               master..origin/master >observed &&
        test_line_count = 0 observed
 '
 
@@ -130,16 +136,22 @@ test_expect_success 'push new commits to server for file.3.txt' '
 # perhaps combined with a command in dry-run mode.
 test_expect_success 'manual prefetch of missing objects' '
        git -C pc1 fetch --filter=blob:none origin &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list --quiet --objects --missing=print \
+                master..origin/master >revs &&
+       awk -f print_1.awk revs |
+       sed "s/?//" |
+       sort >observed.oids &&
+
        test_line_count = 6 observed.oids &&
        git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list --quiet --objects --missing=print \
+               master..origin/master >revs &&
+       awk -f print_1.awk revs |
+       sed "s/?//" |
+       sort >observed.oids &&
+
        test_line_count = 0 observed.oids
 '
 
@@ -154,6 +166,48 @@ test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack -
        grep "git index-pack.*--fsck-objects" trace
 '
 
+test_expect_success 'use fsck before and after manually fetching a missing subtree' '
+       # push new commit so server has a subtree
+       mkdir src/dir &&
+       echo "in dir" >src/dir/file.txt &&
+       git -C src add dir/file.txt &&
+       git -C src commit -m "file in dir" &&
+       git -C src push -u srv master &&
+       SUBTREE=$(git -C src rev-parse HEAD:dir) &&
+
+       rm -rf dst &&
+       git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
+       git -C dst fsck &&
+
+       # Make sure we only have commits, and all trees and blobs are missing.
+       git -C dst rev-list --missing=allow-any --objects master \
+               >fetched_objects &&
+       awk -f print_1.awk fetched_objects |
+       xargs -n1 git -C dst cat-file -t >fetched_types &&
+
+       sort -u fetched_types >unique_types.observed &&
+       echo commit >unique_types.expected &&
+       test_cmp unique_types.expected unique_types.observed &&
+
+       # Auto-fetch a tree with cat-file.
+       git -C dst cat-file -p $SUBTREE >tree_contents &&
+       grep file.txt tree_contents &&
+
+       # fsck still works after an auto-fetch of a tree.
+       git -C dst fsck &&
+
+       # Auto-fetch all remaining trees and blobs with --missing=error
+       git -C dst rev-list --missing=error --objects master >fetched_objects &&
+       test_line_count = 70 fetched_objects &&
+
+       awk -f print_1.awk fetched_objects |
+       xargs -n1 git -C dst cat-file -t >fetched_types &&
+
+       sort -u fetched_types >unique_types.observed &&
+       test_write_lines blob commit tree >unique_types.expected &&
+       test_cmp unique_types.expected unique_types.observed
+'
+
 test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
        rm -rf src dst &&
        git init src &&
@@ -170,6 +224,23 @@ test_expect_success 'partial clone fetches blobs pointed to by refs even if norm
        git -C dst fsck
 '
 
+test_expect_success 'fetch what is specified on CLI even if already promised' '
+       rm -rf src dst.git &&
+       git init src &&
+       test_commit -C src foo &&
+       test_config -C src uploadpack.allowfilter 1 &&
+       test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+       git hash-object --stdin <src/foo.t >blob &&
+
+       git clone --bare --filter=blob:none "file://$(pwd)/src" dst.git &&
+       git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_before &&
+       grep "?$(cat blob)" missing_before &&
+       git -C dst.git fetch origin $(cat blob) &&
+       git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_after &&
+       ! grep "?$(cat blob)" missing_after
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
@@ -194,7 +265,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
 
        # Craft a packfile not including that blob.
        git -C "$SERVER" rev-parse HEAD |
-               git -C "$SERVER" pack-objects --stdout >incomplete.pack &&
+       git -C "$SERVER" pack-objects --stdout >incomplete.pack &&
 
        # Replace the existing packfile with the crafted one. The protocol
        # requires that the packfile be sent in sideband 1, hence the extra