Andrew's git - gitweb.git/blob - t/t5318-commit-graph.sh

   1#!/bin/sh
   2
   3test_description='commit graph'
   4. ./test-lib.sh
   5
   6test_expect_success 'setup full repo' '
   7        mkdir full &&
   8        cd "$TRASH_DIRECTORY/full" &&
   9        git init &&
  10        git config core.commitGraph true &&
  11        objdir=".git/objects"
  12'
  13
  14test_expect_success 'verify graph with no graph file' '
  15        cd "$TRASH_DIRECTORY/full" &&
  16        git commit-graph verify
  17'
  18
  19test_expect_success 'write graph with no packs' '
  20        cd "$TRASH_DIRECTORY/full" &&
  21        git commit-graph write --object-dir . &&
  22        test_path_is_file info/commit-graph
  23'
  24
  25test_expect_success 'create commits and repack' '
  26        cd "$TRASH_DIRECTORY/full" &&
  27        for i in $(test_seq 3)
  28        do
  29                test_commit $i &&
  30                git branch commits/$i
  31        done &&
  32        git repack
  33'
  34
  35graph_git_two_modes() {
  36        git -c core.commitGraph=true $1 >output
  37        git -c core.commitGraph=false $1 >expect
  38        test_cmp output expect
  39}
  40
  41graph_git_behavior() {
  42        MSG=$1
  43        DIR=$2
  44        BRANCH=$3
  45        COMPARE=$4
  46        test_expect_success "check normal git operations: $MSG" '
  47                cd "$TRASH_DIRECTORY/$DIR" &&
  48                graph_git_two_modes "log --oneline $BRANCH" &&
  49                graph_git_two_modes "log --topo-order $BRANCH" &&
  50                graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
  51                graph_git_two_modes "branch -vv" &&
  52                graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
  53        '
  54}
  55
  56graph_git_behavior 'no graph' full commits/3 commits/1
  57
  58graph_read_expect() {
  59        OPTIONAL=""
  60        NUM_CHUNKS=3
  61        if test ! -z $2
  62        then
  63                OPTIONAL=" $2"
  64                NUM_CHUNKS=$((3 + $(echo "$2" | wc -w)))
  65        fi
  66        cat >expect <<- EOF
  67        header: 43475048 1 1 $NUM_CHUNKS 0
  68        num_commits: $1
  69        chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
  70        EOF
  71        git commit-graph read >output &&
  72        test_cmp expect output
  73}
  74
  75test_expect_success 'write graph' '
  76        cd "$TRASH_DIRECTORY/full" &&
  77        graph1=$(git commit-graph write) &&
  78        test_path_is_file $objdir/info/commit-graph &&
  79        graph_read_expect "3"
  80'
  81
  82graph_git_behavior 'graph exists' full commits/3 commits/1
  83
  84test_expect_success 'Add more commits' '
  85        cd "$TRASH_DIRECTORY/full" &&
  86        git reset --hard commits/1 &&
  87        for i in $(test_seq 4 5)
  88        do
  89                test_commit $i &&
  90                git branch commits/$i
  91        done &&
  92        git reset --hard commits/2 &&
  93        for i in $(test_seq 6 7)
  94        do
  95                test_commit $i &&
  96                git branch commits/$i
  97        done &&
  98        git reset --hard commits/2 &&
  99        git merge commits/4 &&
 100        git branch merge/1 &&
 101        git reset --hard commits/4 &&
 102        git merge commits/6 &&
 103        git branch merge/2 &&
 104        git reset --hard commits/3 &&
 105        git merge commits/5 commits/7 &&
 106        git branch merge/3 &&
 107        git repack
 108'
 109
 110# Current graph structure:
 111#
 112#   __M3___
 113#  /   |   \
 114# 3 M1 5 M2 7
 115# |/  \|/  \|
 116# 2    4    6
 117# |___/____/
 118# 1
 119
 120test_expect_success 'write graph with merges' '
 121        cd "$TRASH_DIRECTORY/full" &&
 122        git commit-graph write &&
 123        test_path_is_file $objdir/info/commit-graph &&
 124        graph_read_expect "10" "large_edges"
 125'
 126
 127graph_git_behavior 'merge 1 vs 2' full merge/1 merge/2
 128graph_git_behavior 'merge 1 vs 3' full merge/1 merge/3
 129graph_git_behavior 'merge 2 vs 3' full merge/2 merge/3
 130
 131test_expect_success 'Add one more commit' '
 132        cd "$TRASH_DIRECTORY/full" &&
 133        test_commit 8 &&
 134        git branch commits/8 &&
 135        ls $objdir/pack | grep idx >existing-idx &&
 136        git repack &&
 137        ls $objdir/pack| grep idx | grep -v --file=existing-idx >new-idx
 138'
 139
 140# Current graph structure:
 141#
 142#      8
 143#      |
 144#   __M3___
 145#  /   |   \
 146# 3 M1 5 M2 7
 147# |/  \|/  \|
 148# 2    4    6
 149# |___/____/
 150# 1
 151
 152graph_git_behavior 'mixed mode, commit 8 vs merge 1' full commits/8 merge/1
 153graph_git_behavior 'mixed mode, commit 8 vs merge 2' full commits/8 merge/2
 154
 155test_expect_success 'write graph with new commit' '
 156        cd "$TRASH_DIRECTORY/full" &&
 157        git commit-graph write &&
 158        test_path_is_file $objdir/info/commit-graph &&
 159        graph_read_expect "11" "large_edges"
 160'
 161
 162graph_git_behavior 'full graph, commit 8 vs merge 1' full commits/8 merge/1
 163graph_git_behavior 'full graph, commit 8 vs merge 2' full commits/8 merge/2
 164
 165test_expect_success 'write graph with nothing new' '
 166        cd "$TRASH_DIRECTORY/full" &&
 167        git commit-graph write &&
 168        test_path_is_file $objdir/info/commit-graph &&
 169        graph_read_expect "11" "large_edges"
 170'
 171
 172graph_git_behavior 'cleared graph, commit 8 vs merge 1' full commits/8 merge/1
 173graph_git_behavior 'cleared graph, commit 8 vs merge 2' full commits/8 merge/2
 174
 175test_expect_success 'build graph from latest pack with closure' '
 176        cd "$TRASH_DIRECTORY/full" &&
 177        cat new-idx | git commit-graph write --stdin-packs &&
 178        test_path_is_file $objdir/info/commit-graph &&
 179        graph_read_expect "9" "large_edges"
 180'
 181
 182graph_git_behavior 'graph from pack, commit 8 vs merge 1' full commits/8 merge/1
 183graph_git_behavior 'graph from pack, commit 8 vs merge 2' full commits/8 merge/2
 184
 185test_expect_success 'build graph from commits with closure' '
 186        cd "$TRASH_DIRECTORY/full" &&
 187        git tag -a -m "merge" tag/merge merge/2 &&
 188        git rev-parse tag/merge >commits-in &&
 189        git rev-parse merge/1 >>commits-in &&
 190        cat commits-in | git commit-graph write --stdin-commits &&
 191        test_path_is_file $objdir/info/commit-graph &&
 192        graph_read_expect "6"
 193'
 194
 195graph_git_behavior 'graph from commits, commit 8 vs merge 1' full commits/8 merge/1
 196graph_git_behavior 'graph from commits, commit 8 vs merge 2' full commits/8 merge/2
 197
 198test_expect_success 'build graph from commits with append' '
 199        cd "$TRASH_DIRECTORY/full" &&
 200        git rev-parse merge/3 | git commit-graph write --stdin-commits --append &&
 201        test_path_is_file $objdir/info/commit-graph &&
 202        graph_read_expect "10" "large_edges"
 203'
 204
 205graph_git_behavior 'append graph, commit 8 vs merge 1' full commits/8 merge/1
 206graph_git_behavior 'append graph, commit 8 vs merge 2' full commits/8 merge/2
 207
 208test_expect_success 'setup bare repo' '
 209        cd "$TRASH_DIRECTORY" &&
 210        git clone --bare --no-local full bare &&
 211        cd bare &&
 212        git config core.commitGraph true &&
 213        baredir="./objects"
 214'
 215
 216graph_git_behavior 'bare repo, commit 8 vs merge 1' bare commits/8 merge/1
 217graph_git_behavior 'bare repo, commit 8 vs merge 2' bare commits/8 merge/2
 218
 219test_expect_success 'write graph in bare repo' '
 220        cd "$TRASH_DIRECTORY/bare" &&
 221        git commit-graph write &&
 222        test_path_is_file $baredir/info/commit-graph &&
 223        graph_read_expect "11" "large_edges"
 224'
 225
 226graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
 227graph_git_behavior 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2
 228
 229test_expect_success 'perform fast-forward merge in full repo' '
 230        cd "$TRASH_DIRECTORY/full" &&
 231        git checkout -b merge-5-to-8 commits/5 &&
 232        git merge commits/8 &&
 233        git show-ref -s merge-5-to-8 >output &&
 234        git show-ref -s commits/8 >expect &&
 235        test_cmp expect output
 236'
 237
 238# the verify tests below expect the commit-graph to contain
 239# exactly the commits reachable from the commits/8 branch.
 240# If the file changes the set of commits in the list, then the
 241# offsets into the binary file will result in different edits
 242# and the tests will likely break.
 243
 244test_expect_success 'git commit-graph verify' '
 245        cd "$TRASH_DIRECTORY/full" &&
 246        git rev-parse commits/8 | git commit-graph write --stdin-commits &&
 247        git commit-graph verify >output
 248'
 249
 250NUM_COMMITS=9
 251HASH_LEN=20
 252GRAPH_BYTE_VERSION=4
 253GRAPH_BYTE_HASH=5
 254GRAPH_BYTE_CHUNK_COUNT=6
 255GRAPH_CHUNK_LOOKUP_OFFSET=8
 256GRAPH_CHUNK_LOOKUP_WIDTH=12
 257GRAPH_CHUNK_LOOKUP_ROWS=5
 258GRAPH_BYTE_OID_FANOUT_ID=$GRAPH_CHUNK_LOOKUP_OFFSET
 259GRAPH_BYTE_OID_LOOKUP_ID=$(($GRAPH_CHUNK_LOOKUP_OFFSET + \
 260                            1 * $GRAPH_CHUNK_LOOKUP_WIDTH))
 261GRAPH_BYTE_COMMIT_DATA_ID=$(($GRAPH_CHUNK_LOOKUP_OFFSET + \
 262                             2 * $GRAPH_CHUNK_LOOKUP_WIDTH))
 263GRAPH_FANOUT_OFFSET=$(($GRAPH_CHUNK_LOOKUP_OFFSET + \
 264                       $GRAPH_CHUNK_LOOKUP_WIDTH * $GRAPH_CHUNK_LOOKUP_ROWS))
 265GRAPH_BYTE_FANOUT1=$(($GRAPH_FANOUT_OFFSET + 4 * 4))
 266GRAPH_BYTE_FANOUT2=$(($GRAPH_FANOUT_OFFSET + 4 * 255))
 267GRAPH_OID_LOOKUP_OFFSET=$(($GRAPH_FANOUT_OFFSET + 4 * 256))
 268GRAPH_BYTE_OID_LOOKUP_ORDER=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * 8))
 269GRAPH_BYTE_OID_LOOKUP_MISSING=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * 4 + 10))
 270GRAPH_COMMIT_DATA_OFFSET=$(($GRAPH_OID_LOOKUP_OFFSET + $HASH_LEN * $NUM_COMMITS))
 271GRAPH_BYTE_COMMIT_TREE=$GRAPH_COMMIT_DATA_OFFSET
 272GRAPH_BYTE_COMMIT_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN))
 273GRAPH_BYTE_COMMIT_EXTRA_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 4))
 274GRAPH_BYTE_COMMIT_WRONG_PARENT=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 3))
 275GRAPH_BYTE_COMMIT_GENERATION=$(($GRAPH_COMMIT_DATA_OFFSET + $HASH_LEN + 11))
 276
 277# usage: corrupt_graph_and_verify <position> <data> <string>
 278# Manipulates the commit-graph file at the position
 279# by inserting the data, then runs 'git commit-graph verify'
 280# and places the output in the file 'err'. Test 'err' for
 281# the given string.
 282corrupt_graph_and_verify() {
 283        pos=$1
 284        data="${2:-\0}"
 285        grepstr=$3
 286        cd "$TRASH_DIRECTORY/full" &&
 287        test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
 288        cp $objdir/info/commit-graph commit-graph-backup &&
 289        printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc &&
 290        test_must_fail git commit-graph verify 2>test_err &&
 291        grep -v "^+" test_err >err
 292        test_i18ngrep "$grepstr" err
 293}
 294
 295test_expect_success 'detect bad signature' '
 296        corrupt_graph_and_verify 0 "\0" \
 297                "graph signature"
 298'
 299
 300test_expect_success 'detect bad version' '
 301        corrupt_graph_and_verify $GRAPH_BYTE_VERSION "\02" \
 302                "graph version"
 303'
 304
 305test_expect_success 'detect bad hash version' '
 306        corrupt_graph_and_verify $GRAPH_BYTE_HASH "\02" \
 307                "hash version"
 308'
 309
 310test_expect_success 'detect low chunk count' '
 311        corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\02" \
 312                "missing the .* chunk"
 313'
 314
 315test_expect_success 'detect missing OID fanout chunk' '
 316        corrupt_graph_and_verify $GRAPH_BYTE_OID_FANOUT_ID "\0" \
 317                "missing the OID Fanout chunk"
 318'
 319
 320test_expect_success 'detect missing OID lookup chunk' '
 321        corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ID "\0" \
 322                "missing the OID Lookup chunk"
 323'
 324
 325test_expect_success 'detect missing commit data chunk' '
 326        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATA_ID "\0" \
 327                "missing the Commit Data chunk"
 328'
 329
 330test_expect_success 'detect incorrect fanout' '
 331        corrupt_graph_and_verify $GRAPH_BYTE_FANOUT1 "\01" \
 332                "fanout value"
 333'
 334
 335test_expect_success 'detect incorrect fanout final value' '
 336        corrupt_graph_and_verify $GRAPH_BYTE_FANOUT2 "\01" \
 337                "fanout value"
 338'
 339
 340test_expect_success 'detect incorrect OID order' '
 341        corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ORDER "\01" \
 342                "incorrect OID order"
 343'
 344
 345test_expect_success 'detect OID not in object database' '
 346        corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_MISSING "\01" \
 347                "from object database"
 348'
 349
 350test_expect_success 'detect incorrect tree OID' '
 351        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_TREE "\01" \
 352                "root tree OID for commit"
 353'
 354
 355test_expect_success 'detect incorrect parent int-id' '
 356        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_PARENT "\01" \
 357                "invalid parent"
 358'
 359
 360test_expect_success 'detect extra parent int-id' '
 361        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_EXTRA_PARENT "\00" \
 362                "is too long"
 363'
 364
 365test_expect_success 'detect wrong parent' '
 366        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_WRONG_PARENT "\01" \
 367                "commit-graph parent for"
 368'
 369
 370test_expect_success 'detect incorrect generation number' '
 371        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\070" \
 372                "generation for commit"
 373'
 374
 375test_expect_success 'detect incorrect generation number' '
 376        corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\01" \
 377                "non-zero generation number"
 378'
 379
 380test_done