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