Merge branch 'js/mingw-getcwd'

diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index b00cf6fa827ccddafbd0abdec2dc2a0b00c1deba..eb32505a6ef8804f4f7762ce0332f00beeacbe99 100755 (executable)
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -25,7 +25,8 @@ test_expect_success 'verify blob:none omits all 5 blobs' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none >revs &&
+       git -C r1 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:none HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -33,13 +34,25 @@ test_expect_success 'verify blob:none omits all 5 blobs' '
        test_cmp expected observed
 '
 
+test_expect_success 'specify blob explicitly prevents filtering' '
+       file_3=$(git -C r1 ls-files -s file.3 |
+                awk -f print_2.awk) &&
+
+       file_4=$(git -C r1 ls-files -s file.4 |
+                awk -f print_2.awk) &&
+
+       git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed &&
+       grep "$file_3" observed &&
+       ! grep "$file_4" observed
+'
+
 test_expect_success 'verify emitted+omitted == all' '
-       git -C r1 rev-list HEAD --objects >revs &&
+       git -C r1 rev-list --objects HEAD >revs &&
        awk -f print_1.awk revs |
        sort >expected &&
 
-       git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none \
-               >revs &&
+       git -C r1 rev-list --objects --filter-print-omitted --filter=blob:none \
+               HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -68,7 +81,8 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 >revs &&
+       git -C r2 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:limit=500 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -77,11 +91,12 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
 '
 
 test_expect_success 'verify emitted+omitted == all' '
-       git -C r2 rev-list HEAD --objects >revs &&
+       git -C r2 rev-list --objects HEAD >revs &&
        awk -f print_1.awk revs |
        sort >expected &&
 
-       git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 >revs &&
+       git -C r2 rev-list --objects --filter-print-omitted \
+               --filter=blob:limit=500 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -94,7 +109,8 @@ test_expect_success 'verify blob:limit=1000' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 >revs &&
+       git -C r2 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:limit=1000 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -107,7 +123,8 @@ test_expect_success 'verify blob:limit=1001' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 >revs &&
+       git -C r2 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:limit=1001 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -120,7 +137,8 @@ test_expect_success 'verify blob:limit=1k' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k >revs &&
+       git -C r2 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:limit=1k HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -129,7 +147,8 @@ test_expect_success 'verify blob:limit=1k' '
 '
 
 test_expect_success 'verify blob:limit=1m' '
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m >revs &&
+       git -C r2 rev-list --quiet --objects --filter-print-omitted \
+               --filter=blob:limit=1m HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -162,7 +181,8 @@ test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 >revs &&
+       git -C r3 rev-list --quiet --objects --filter-print-omitted \
+               --filter=sparse:path=../pattern1 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -175,7 +195,8 @@ test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 >revs &&
+       git -C r3 rev-list --quiet --objects --filter-print-omitted \
+               --filter=sparse:path=../pattern2 HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -200,7 +221,8 @@ test_expect_success 'verify sparse:oid=OID omits top-level files' '
 
        oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
 
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid >revs &&
+       git -C r3 rev-list --quiet --objects --filter-print-omitted \
+               --filter=sparse:oid=$oid HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -213,7 +235,8 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
        awk -f print_2.awk ls_files_result |
        sort >expected &&
 
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern >revs &&
+       git -C r3 rev-list --quiet --objects --filter-print-omitted \
+               --filter=sparse:oid=master:pattern HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/~//" |
        sort >observed &&
@@ -221,6 +244,56 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
        test_cmp expected observed
 '
 
+test_expect_success 'rev-list W/ --missing=print and --missing=allow-any for trees' '
+       TREE=$(git -C r3 rev-parse HEAD:dir1) &&
+
+       # Create a spare repo because we will be deleting objects from this one.
+       git clone r3 r3.b &&
+
+       rm r3.b/.git/objects/$(echo $TREE | sed "s|^..|&/|") &&
+
+       git -C r3.b rev-list --quiet --missing=print --objects HEAD \
+               >missing_objs 2>rev_list_err &&
+       echo "?$TREE" >expected &&
+       test_cmp expected missing_objs &&
+
+       # do not complain when a missing tree cannot be parsed
+       test_must_be_empty rev_list_err &&
+
+       git -C r3.b rev-list --missing=allow-any --objects HEAD \
+               >objs 2>rev_list_err &&
+       ! grep $TREE objs &&
+       test_must_be_empty rev_list_err
+'
+
+# Test tree:0 filter.
+
+test_expect_success 'verify tree:0 includes trees in "filtered" output' '
+       git -C r3 rev-list --quiet --objects --filter-print-omitted \
+               --filter=tree:0 HEAD >revs &&
+
+       awk -f print_1.awk revs |
+       sed s/~// |
+       xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types &&
+
+       sort -u unsorted_filtered_types >filtered_types &&
+       test_write_lines blob tree >expected &&
+       test_cmp expected filtered_types
+'
+
+# Make sure tree:0 does not iterate through any trees.
+
+test_expect_success 'filter a GIANT tree through tree:0' '
+       GIT_TRACE=1 git -C r3 rev-list \
+               --objects --filter=tree:0 HEAD 2>filter_trace &&
+       grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
+       # One line for each commit traversed.
+       test_line_count = 2 actual &&
+
+       # Make sure no other trees were considered besides the root.
+       ! grep "Skipping contents of tree [^.]" filter_trace
+'
+
 # Delete some loose objects and use rev-list, but WITHOUT any filtering.
 # This models previously omitted objects that we did not receive.
 
@@ -235,7 +308,7 @@ test_expect_success 'rev-list W/ --missing=print' '
                rm r1/.git/objects/$id
        done &&
 
-       git -C r1 rev-list --quiet HEAD --missing=print --objects >revs &&
+       git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
        awk -f print_1.awk revs |
        sed "s/?//" |
        sort >observed &&