Merge up to git v2.32.0

5 files changed, 19 insertions, 18 deletions

@@ -80,13 +80,17 @@ mkrepo() {
                         git commit -m "commit $n"
                         n=$(expr $n + 1)
                 done
-                if test "$3" = "testplus"
-                then
+                case "$3" in
+                testplus)
                         echo "hello" >a+b
                         git add a+b
                         git commit -m "add a+b"
                         git branch "1+2"
-                fi
+                        ;;
+                commit-graph)
+                        git commit-graph write
+                        ;;
+                esac
         )
 }
 
@@ -95,7 +99,7 @@ setup_repos()
         rm -rf cache
         mkdir -p cache
         mkrepo repos/foo 5 >/dev/null
-        mkrepo repos/bar 50 >/dev/null
+        mkrepo repos/bar 50 commit-graph >/dev/null
         mkrepo repos/foo+bar 10 testplus >/dev/null
         mkrepo "repos/with space" 2 >/dev/null
         mkrepo repos/filter 5 testplus >/dev/null
@@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
         else
                 (
                         cd ../.. &&
-                        sm_sha1=$(git ls-files --stage -- git |
+                        sm_oid=$(git ls-files --stage -- git |
                                 sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
                         cd git &&
-                        git describe --match "v[0-9]*" $sm_sha1
+                        git describe --match "v[0-9]*" $sm_oid
                 ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
                 test_cmp sm_version makefile_version
         fi
@@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
 '
 
 test_expect_success 'root commit contains diffstat' '
-        grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp
+        grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
 '
 
 test_expect_success 'root commit contains diff' '
@@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' '
 
 test_expect_success 'untar' '
         rm -rf master &&
-        tar -xzf master.tar.gz
+        gzip -dc master.tar.gz | tar -xf -
 '
 
 test_expect_success 'count files' '
@@ -61,13 +61,12 @@ test_expect_success LZIP 'strip off the header lines' '
 '
 
 test_expect_success LZIP 'verify lzip format' '
-        lzip --test master.tar.lz &&
-        cp master.tar.lz /tmp/.
+        lzip --test master.tar.lz
 '
 
 test_expect_success LZIP 'untar' '
         rm -rf master &&
-        tar --lzip -xf master.tar.lz
+        lzip -dc master.tar.lz | tar -xf -
 '
 
 test_expect_success LZIP 'count files' '
@@ -103,13 +102,12 @@ test_expect_success XZ 'strip off the header lines' '
 '
 
 test_expect_success XZ 'verify xz format' '
-        xz --test master.tar.xz &&
-        cp master.tar.xz /tmp/.
+        xz --test master.tar.xz
 '
 
 test_expect_success XZ 'untar' '
         rm -rf master &&
-        tar --xz -xf master.tar.xz
+        xz -dc master.tar.xz | tar -xf -
 '
 
 test_expect_success XZ 'count files' '
@@ -145,13 +143,12 @@ test_expect_success ZSTD 'strip off the header lines' '
 '
 
 test_expect_success ZSTD 'verify zstd format' '
-        zstd --test master.tar.zst &&
-        cp master.tar.zst /tmp/.
+        zstd --test master.tar.zst
 '
 
 test_expect_success ZSTD 'untar' '
         rm -rf master &&
-        tar --zstd -xf master.tar.zst
+        zstd -dc master.tar.zst | tar -xf -
 '
 
 test_expect_success ZSTD 'count files' '
@@ -25,7 +25,7 @@ test_no_home_access () {
                 -E CGIT_CONFIG="$PWD/cgitrc" \
                 -E QUERY_STRING="url=$1" \
                 -e access -f -o strace.out cgit &&
-        test_must_fail grep "$non_existent_path" strace.out
+        ! grep "$non_existent_path" strace.out
 }
 
 test_no_home_access_success() {