Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / t / t5318-commit-graph.sh

diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index edb728f77c3583cecde2d87555a4547464db7b96..fbf0d64578cde0544251020cf0df5ea6b90c4a2e 100755 (executable)
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -29,12 +29,7 @@ test_expect_success 'setup full repo' '
        cd "$TRASH_DIRECTORY/full" &&
        git init &&
        git config core.commitGraph true &&
-       objdir=".git/objects" &&
-
-       test_oid_cache <<-EOF
-       oid_version sha1:1
-       oid_version sha256:2
-       EOF
+       objdir=".git/objects"
 '
 
 test_expect_success POSIXPERM 'tweak umask for modebit tests' '
@@ -69,46 +64,10 @@ test_expect_success 'create commits and repack' '
        git repack
 '
 
-graph_git_two_modes() {
-       git -c core.commitGraph=true $1 >output &&
-       git -c core.commitGraph=false $1 >expect &&
-       test_cmp expect output
-}
-
-graph_git_behavior() {
-       MSG=$1
-       DIR=$2
-       BRANCH=$3
-       COMPARE=$4
-       test_expect_success "check normal git operations: $MSG" '
-               cd "$TRASH_DIRECTORY/$DIR" &&
-               graph_git_two_modes "log --oneline $BRANCH" &&
-               graph_git_two_modes "log --topo-order $BRANCH" &&
-               graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
-               graph_git_two_modes "branch -vv" &&
-               graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
-       '
-}
+. "$TEST_DIRECTORY"/lib-commit-graph.sh
 
 graph_git_behavior 'no graph' full commits/3 commits/1
 
-graph_read_expect() {
-       OPTIONAL=""
-       NUM_CHUNKS=3
-       if test ! -z "$2"
-       then
-               OPTIONAL=" $2"
-               NUM_CHUNKS=$((3 + $(echo "$2" | wc -w)))
-       fi
-       cat >expect <<- EOF
-       header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
-       num_commits: $1
-       chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
-       EOF
-       test-tool read-graph >output &&
-       test_cmp expect output
-}
-
 test_expect_success 'exit with correct error on bad input to --stdin-commits' '
        cd "$TRASH_DIRECTORY/full" &&
        # invalid, non-hex OID
@@ -466,10 +425,10 @@ test_expect_success 'warn on improper hash version' '
        )
 '
 
-test_expect_success 'lower layers have overflow chunk' '
+test_expect_success TIME_IS_64BIT,TIME_T_IS_64BIT 'lower layers have overflow chunk' '
        cd "$TRASH_DIRECTORY/full" &&
        UNIX_EPOCH_ZERO="@0 +0000" &&
-       FUTURE_DATE="@2147483646 +0000" &&
+       FUTURE_DATE="@4147483646 +0000" &&
        rm -f .git/objects/info/commit-graph &&
        test_commit --date "$FUTURE_DATE" future-1 &&
        test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
@@ -497,7 +456,7 @@ test_expect_success 'git commit-graph verify' '
        cd "$TRASH_DIRECTORY/full" &&
        git rev-parse commits/8 | git -c commitGraph.generationVersion=1 commit-graph write --stdin-commits &&
        git commit-graph verify >output &&
-       graph_read_expect 9 extra_edges
+       graph_read_expect 9 extra_edges 1
 '
 
 NUM_COMMITS=9
@@ -825,10 +784,6 @@ test_expect_success 'set up and verify repo with generation data overflow chunk'
        objdir=".git/objects" &&
        UNIX_EPOCH_ZERO="@0 +0000" &&
        FUTURE_DATE="@2147483646 +0000" &&
-       test_oid_cache <<-EOF &&
-       oid_version sha1:1
-       oid_version sha256:2
-       EOF
        cd "$TRASH_DIRECTORY" &&
        mkdir repo &&
        cd repo &&