3 test_description
='split commit graph'
6 GIT_TEST_COMMIT_GRAPH
=0
7 GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS
=0
9 test_expect_success
'setup repo' '
11 git config core.commitGraph true &&
12 git config gc.writeCommitGraph false &&
13 infodir=".git/objects/info" &&
14 graphdir="$infodir/commit-graphs" &&
36 OPTIONS
=" read_generation_data"
39 header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE
41 chunks: oid_fanout oid_lookup commit_metadata generation_data
44 test-tool read-graph
>output
&&
45 test_cmp expect output
48 test_expect_success POSIXPERM
'tweak umask for modebit tests' '
52 test_expect_success
'create commits and write commit-graph' '
53 for i in $(test_seq 3)
56 git branch commits/$i || return 1
58 git commit-graph write --reachable &&
59 test_path_is_file $infodir/commit-graph &&
63 graph_git_two_modes
() {
64 git
${2:+ -C "$2"} -c core.commitGraph
=true
$1 >output
&&
65 git
${2:+ -C "$2"} -c core.commitGraph
=false
$1 >expect
&&
66 test_cmp expect output
69 graph_git_behavior
() {
74 test_expect_success
"check normal git operations: $MSG" '
75 graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
76 graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
77 graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
78 graph_git_two_modes "branch -vv" "$DIR" &&
79 graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
83 graph_git_behavior
'graph exists' commits
/3 commits
/1
85 verify_chain_files_exist
() {
86 for hash in $
(cat $1/commit-graph-chain
)
88 test_path_is_file
$1/graph-
$hash.graph ||
return 1
92 test_expect_success
'add more commits, and write a new base graph' '
93 git reset --hard commits/1 &&
94 for i in $(test_seq 4 5)
97 git branch commits/$i || return 1
99 git reset --hard commits/2 &&
100 for i in $(test_seq 6 10)
103 git branch commits/$i || return 1
105 git reset --hard commits/2 &&
106 git merge commits/4 &&
107 git branch merge/1 &&
108 git reset --hard commits/4 &&
109 git merge commits/6 &&
110 git branch merge/2 &&
111 git commit-graph write --reachable &&
115 test_expect_success
'fork and fail to base a chain on a commit-graph file' '
116 test_when_finished rm -rf fork &&
120 rm .git/objects/info/commit-graph &&
121 echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
122 test_commit new-commit &&
123 git commit-graph write --reachable --split &&
124 test_path_is_file $graphdir/commit-graph-chain &&
125 test_line_count = 1 $graphdir/commit-graph-chain &&
126 verify_chain_files_exist $graphdir
130 test_expect_success
'add three more commits, write a tip graph' '
131 git reset --hard commits/3 &&
133 git merge commits/5 &&
135 git branch merge/3 &&
136 git commit-graph write --reachable --split &&
137 test_path_is_missing $infodir/commit-graph &&
138 test_path_is_file $graphdir/commit-graph-chain &&
139 ls $graphdir/graph-*.graph >graph-files &&
140 test_line_count = 2 graph-files &&
141 verify_chain_files_exist $graphdir
144 graph_git_behavior
'split commit-graph: merge 3 vs 2' merge
/3 merge
/2
146 test_expect_success
'add one commit, write a tip graph' '
148 git branch commits/11 &&
149 git commit-graph write --reachable --split &&
150 test_path_is_missing $infodir/commit-graph &&
151 test_path_is_file $graphdir/commit-graph-chain &&
152 ls $graphdir/graph-*.graph >graph-files &&
153 test_line_count = 3 graph-files &&
154 verify_chain_files_exist $graphdir
157 graph_git_behavior
'three-layer commit-graph: commit 11 vs 6' commits
/11 commits
/6
159 test_expect_success
'add one commit, write a merged graph' '
161 git branch commits/12 &&
162 git commit-graph write --reachable --split &&
163 test_path_is_file $graphdir/commit-graph-chain &&
164 test_line_count = 2 $graphdir/commit-graph-chain &&
165 ls $graphdir/graph-*.graph >graph-files &&
166 test_line_count = 2 graph-files &&
167 verify_chain_files_exist $graphdir
170 graph_git_behavior
'merged commit-graph: commit 12 vs 6' commits
/12 commits
/6
172 test_expect_success
'create fork and chain across alternate' '
176 git config core.commitGraph true &&
178 echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
180 git branch commits/13 &&
181 git commit-graph write --reachable --split &&
182 test_path_is_file $graphdir/commit-graph-chain &&
183 test_line_count = 3 $graphdir/commit-graph-chain &&
184 ls $graphdir/graph-*.graph >graph-files &&
185 test_line_count = 1 graph-files &&
186 git -c core.commitGraph=true rev-list HEAD >expect &&
187 git -c core.commitGraph=false rev-list HEAD >actual &&
188 test_cmp expect actual &&
190 git commit-graph write --reachable --split --object-dir=.git/objects/ &&
191 test_line_count = 3 $graphdir/commit-graph-chain &&
192 ls $graphdir/graph-*.graph >graph-files &&
193 test_line_count = 1 graph-files
199 graph_git_behavior
'alternate: commit 13 vs 6' commits
/13 origin
/commits
/6 "fork"
202 test_expect_success
'test merge stragety constants' '
203 git clone . merge-2 &&
206 git config core.commitGraph true &&
207 test_line_count = 2 $graphdir/commit-graph-chain &&
209 git commit-graph write --reachable --split --size-multiple=2 &&
210 test_line_count = 3 $graphdir/commit-graph-chain
213 git clone . merge-10 &&
216 git config core.commitGraph true &&
217 test_line_count = 2 $graphdir/commit-graph-chain &&
219 git commit-graph write --reachable --split --size-multiple=10 &&
220 test_line_count = 1 $graphdir/commit-graph-chain &&
221 ls $graphdir/graph-*.graph >graph-files &&
222 test_line_count = 1 graph-files
224 git clone . merge-10-expire &&
226 cd merge-10-expire &&
227 git config core.commitGraph true &&
228 test_line_count = 2 $graphdir/commit-graph-chain &&
230 touch $graphdir/to-delete.graph $graphdir/to-keep.graph &&
231 test-tool chmtime =1546362000 $graphdir/to-delete.graph &&
232 test-tool chmtime =1546362001 $graphdir/to-keep.graph &&
233 git commit-graph write --reachable --split --size-multiple=10 \
234 --expire-time="2019-01-01 12:00 -05:00" &&
235 test_line_count = 1 $graphdir/commit-graph-chain &&
236 test_path_is_missing $graphdir/to-delete.graph &&
237 test_path_is_file $graphdir/to-keep.graph &&
238 ls $graphdir/graph-*.graph >graph-files &&
239 test_line_count = 3 graph-files
241 git clone --no-hardlinks . max-commits &&
244 git config core.commitGraph true &&
245 test_line_count = 2 $graphdir/commit-graph-chain &&
248 git commit-graph write --reachable --split --max-commits=1 &&
249 test_line_count = 1 $graphdir/commit-graph-chain &&
250 ls $graphdir/graph-*.graph >graph-files &&
251 test_line_count = 1 graph-files
255 test_expect_success
'remove commit-graph-chain file after flattening' '
256 git clone . flatten &&
259 test_line_count = 2 $graphdir/commit-graph-chain &&
260 git commit-graph write --reachable &&
261 test_path_is_missing $graphdir/commit-graph-chain &&
262 ls $graphdir >graph-files &&
263 test_line_count = 0 graph-files
272 printf "$data" |
dd of
="$file" bs
=1 seek
="$pos" conv
=notrunc
275 test_expect_success
'verify hashes along chain, even in shallow' '
276 git clone --no-hardlinks . verify &&
279 git commit-graph verify &&
280 base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
281 corrupt_file "$base_file" $(test_oid shallow) "\01" &&
282 test_must_fail git commit-graph verify --shallow 2>test_err &&
283 grep -v "^+" test_err >err &&
284 test_i18ngrep "incorrect checksum" err
288 test_expect_success
'verify --shallow does not check base contents' '
289 git clone --no-hardlinks . verify-shallow &&
292 git commit-graph verify &&
293 base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
294 corrupt_file "$base_file" 1000 "\01" &&
295 git commit-graph verify --shallow &&
296 test_must_fail git commit-graph verify 2>test_err &&
297 grep -v "^+" test_err >err &&
298 test_i18ngrep "incorrect checksum" err
302 test_expect_success
'warn on base graph chunk incorrect' '
303 git clone --no-hardlinks . base-chunk &&
306 git commit-graph verify &&
307 base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
308 corrupt_file "$base_file" $(test_oid base) "\01" &&
309 git commit-graph verify --shallow 2>test_err &&
310 grep -v "^+" test_err >err &&
311 test_i18ngrep "commit-graph chain does not match" err
315 test_expect_success
'verify after commit-graph-chain corruption' '
316 git clone --no-hardlinks . verify-chain &&
319 corrupt_file "$graphdir/commit-graph-chain" 60 "G" &&
320 git commit-graph verify 2>test_err &&
321 grep -v "^+" test_err >err &&
322 test_i18ngrep "invalid commit-graph chain" err &&
323 corrupt_file "$graphdir/commit-graph-chain" 60 "A" &&
324 git commit-graph verify 2>test_err &&
325 grep -v "^+" test_err >err &&
326 test_i18ngrep "unable to find all commit-graph files" err
330 test_expect_success
'verify across alternates' '
331 git clone --no-hardlinks . verify-alt &&
335 altdir="$(pwd)/../.git/objects" &&
336 echo "$altdir" >.git/objects/info/alternates &&
337 git commit-graph verify --object-dir="$altdir/" &&
339 git commit-graph write --reachable --split &&
340 tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
341 corrupt_file "$tip_file" 100 "\01" &&
342 test_must_fail git commit-graph verify --shallow 2>test_err &&
343 grep -v "^+" test_err >err &&
344 test_i18ngrep "commit-graph has incorrect fanout value" err
348 test_expect_success
'add octopus merge' '
349 git reset --hard commits/10 &&
350 git merge commits/3 commits/4 &&
351 git branch merge/octopus &&
352 git commit-graph write --reachable --split &&
353 git commit-graph verify --progress 2>err &&
354 test_line_count = 3 err &&
355 test_i18ngrep ! warning err &&
356 test_line_count = 3 $graphdir/commit-graph-chain
359 graph_git_behavior
'graph exists' merge
/octopus commits
/12
361 test_expect_success
'split across alternate where alternate is not split' '
362 git commit-graph write --reachable &&
363 test_path_is_file .git/objects/info/commit-graph &&
364 cp .git/objects/info/commit-graph . &&
365 git clone --no-hardlinks . alt-split &&
368 rm -f .git/objects/info/commit-graph &&
369 echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
371 git commit-graph write --reachable --split &&
372 test_line_count = 1 $graphdir/commit-graph-chain
374 test_cmp commit-graph .git/objects/info/commit-graph
377 test_expect_success
'--split=no-merge always writes an incremental' '
378 test_when_finished rm -rf a b &&
379 rm -rf $graphdir $infodir/commit-graph &&
380 git reset --hard commits/2 &&
381 git rev-list HEAD~1 >a &&
382 git rev-list HEAD >b &&
383 git commit-graph write --split --stdin-commits <a &&
384 git commit-graph write --split=no-merge --stdin-commits <b &&
385 test_line_count = 2 $graphdir/commit-graph-chain
388 test_expect_success
'--split=replace replaces the chain' '
389 rm -rf $graphdir $infodir/commit-graph &&
390 git reset --hard commits/3 &&
391 git rev-list -1 HEAD~2 >a &&
392 git rev-list -1 HEAD~1 >b &&
393 git rev-list -1 HEAD >c &&
394 git commit-graph write --split=no-merge --stdin-commits <a &&
395 git commit-graph write --split=no-merge --stdin-commits <b &&
396 git commit-graph write --split=no-merge --stdin-commits <c &&
397 test_line_count = 3 $graphdir/commit-graph-chain &&
398 git commit-graph write --stdin-commits --split=replace <b &&
399 test_path_is_missing $infodir/commit-graph &&
400 test_path_is_file $graphdir/commit-graph-chain &&
401 ls $graphdir/graph-*.graph >graph-files &&
402 test_line_count = 1 graph-files &&
403 verify_chain_files_exist $graphdir &&
407 test_expect_success ULIMIT_FILE_DESCRIPTORS
'handles file descriptor exhaustion' '
411 for i in $(test_seq 64)
414 run_with_limited_open_files test_might_fail git commit-graph write \
415 --split=no-merge --reachable || return 1
420 while read mode modebits
422 test_expect_success POSIXPERM
"split commit-graph respects core.sharedrepository $mode" '
423 rm -rf $graphdir $infodir/commit-graph &&
424 git reset --hard commits/1 &&
425 test_config core.sharedrepository "$mode" &&
426 git commit-graph write --split --reachable &&
427 ls $graphdir/graph-*.graph >graph-files &&
428 test_line_count = 1 graph-files &&
429 echo "$modebits" >expect &&
430 test_modebits $graphdir/graph-*.graph >actual &&
431 test_cmp expect actual &&
432 test_modebits $graphdir/commit-graph-chain >actual &&
433 test_cmp expect actual
440 test_expect_success
'--split=replace with partial Bloom data' '
441 rm -rf $graphdir $infodir/commit-graph &&
442 git reset --hard commits/3 &&
443 git rev-list -1 HEAD~2 >a &&
444 git rev-list -1 HEAD~1 >b &&
445 git commit-graph write --split=no-merge --stdin-commits --changed-paths <a &&
446 git commit-graph write --split=no-merge --stdin-commits <b &&
447 git commit-graph write --split=replace --stdin-commits --changed-paths <c &&
448 ls $graphdir/graph-*.graph >graph-files &&
449 test_line_count = 1 graph-files &&
450 verify_chain_files_exist $graphdir
453 test_expect_success
'prevent regression for duplicate commits across layers' '
455 git -C dup commit --allow-empty -m one &&
456 git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
457 test_i18ngrep "attempting to write a commit-graph" err &&
458 git -C dup commit-graph write --split=no-merge --reachable &&
459 git -C dup commit --allow-empty -m two &&
460 git -C dup commit-graph write --split=no-merge --reachable &&
461 git -C dup commit --allow-empty -m three &&
462 git -C dup commit-graph write --split --reachable &&
463 git -C dup commit-graph verify
466 NUM_FIRST_LAYER_COMMITS
=64
467 NUM_SECOND_LAYER_COMMITS
=16
468 NUM_THIRD_LAYER_COMMITS
=7
469 NUM_FOURTH_LAYER_COMMITS
=8
470 NUM_FIFTH_LAYER_COMMITS
=16
471 SECOND_LAYER_SEQUENCE_START
=$
(($NUM_FIRST_LAYER_COMMITS + 1))
472 SECOND_LAYER_SEQUENCE_END
=$
(($SECOND_LAYER_SEQUENCE_START + $NUM_SECOND_LAYER_COMMITS - 1))
473 THIRD_LAYER_SEQUENCE_START
=$
(($SECOND_LAYER_SEQUENCE_END + 1))
474 THIRD_LAYER_SEQUENCE_END
=$
(($THIRD_LAYER_SEQUENCE_START + $NUM_THIRD_LAYER_COMMITS - 1))
475 FOURTH_LAYER_SEQUENCE_START
=$
(($THIRD_LAYER_SEQUENCE_END + 1))
476 FOURTH_LAYER_SEQUENCE_END
=$
(($FOURTH_LAYER_SEQUENCE_START + $NUM_FOURTH_LAYER_COMMITS - 1))
477 FIFTH_LAYER_SEQUENCE_START
=$
(($FOURTH_LAYER_SEQUENCE_END + 1))
478 FIFTH_LAYER_SEQUENCE_END
=$
(($FIFTH_LAYER_SEQUENCE_START + $NUM_FIFTH_LAYER_COMMITS - 1))
480 # Current split graph chain:
482 # 16 commits (No GDAT)
483 # ------------------------
486 test_expect_success
'setup repo for mixed generation commit-graph-chain' '
487 graphdir=".git/objects/info/commit-graphs" &&
488 test_oid_cache <<-EOF &&
495 git config core.commitGraph true &&
496 git config gc.writeCommitGraph false &&
497 for i in $(test_seq $NUM_FIRST_LAYER_COMMITS)
500 git branch commits/$i || return 1
502 git -c commitGraph.generationVersion=2 commit-graph write --reachable --split &&
503 graph_read_expect $NUM_FIRST_LAYER_COMMITS &&
504 test_line_count = 1 $graphdir/commit-graph-chain &&
505 for i in $(test_seq $SECOND_LAYER_SEQUENCE_START $SECOND_LAYER_SEQUENCE_END)
508 git branch commits/$i || return 1
510 git -c commitGraph.generationVersion=1 commit-graph write --reachable --split=no-merge &&
511 test_line_count = 2 $graphdir/commit-graph-chain &&
512 test-tool read-graph >output &&
513 cat >expect <<-EOF &&
514 header: 43475048 1 $(test_oid oid_version) 4 1
515 num_commits: $NUM_SECOND_LAYER_COMMITS
516 chunks: oid_fanout oid_lookup commit_metadata
519 test_cmp expect output &&
520 git commit-graph verify &&
521 cat $graphdir/commit-graph-chain
525 # The new layer will be added without generation data chunk as it was not
526 # present on the layer underneath it.
528 # 7 commits (No GDAT)
529 # ------------------------
530 # 16 commits (No GDAT)
531 # ------------------------
534 test_expect_success
'do not write generation data chunk if not present on existing tip' '
535 git clone mixed mixed-no-gdat &&
538 for i in $(test_seq $THIRD_LAYER_SEQUENCE_START $THIRD_LAYER_SEQUENCE_END)
541 git branch commits/$i || return 1
543 git commit-graph write --reachable --split=no-merge &&
544 test_line_count = 3 $graphdir/commit-graph-chain &&
545 test-tool read-graph >output &&
546 cat >expect <<-EOF &&
547 header: 43475048 1 $(test_oid oid_version) 4 2
548 num_commits: $NUM_THIRD_LAYER_COMMITS
549 chunks: oid_fanout oid_lookup commit_metadata
552 test_cmp expect output &&
553 git commit-graph verify
557 # Number of commits in each layer of the split-commit graph before merge:
559 # 8 commits (No GDAT)
560 # ------------------------
561 # 7 commits (No GDAT)
562 # ------------------------
563 # 16 commits (No GDAT)
564 # ------------------------
567 # The top two layers are merged and do not have generation data chunk as layer below them does
568 # not have generation data chunk.
570 # 15 commits (No GDAT)
571 # ------------------------
572 # 16 commits (No GDAT)
573 # ------------------------
576 test_expect_success
'do not write generation data chunk if the topmost remaining layer does not have generation data chunk' '
577 git clone mixed-no-gdat mixed-merge-no-gdat &&
579 cd mixed-merge-no-gdat &&
580 for i in $(test_seq $FOURTH_LAYER_SEQUENCE_START $FOURTH_LAYER_SEQUENCE_END)
583 git branch commits/$i || return 1
585 git commit-graph write --reachable --split --size-multiple 1 &&
586 test_line_count = 3 $graphdir/commit-graph-chain &&
587 test-tool read-graph >output &&
588 cat >expect <<-EOF &&
589 header: 43475048 1 $(test_oid oid_version) 4 2
590 num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
591 chunks: oid_fanout oid_lookup commit_metadata
594 test_cmp expect output &&
595 git commit-graph verify
599 # Number of commits in each layer of the split-commit graph before merge:
601 # 16 commits (No GDAT)
602 # ------------------------
603 # 15 commits (No GDAT)
604 # ------------------------
605 # 16 commits (No GDAT)
606 # ------------------------
609 # The top three layers are merged and has generation data chunk as the topmost remaining layer
610 # has generation data chunk.
613 # ------------------------
616 test_expect_success
'write generation data chunk if topmost remaining layer has generation data chunk' '
617 git clone mixed-merge-no-gdat mixed-merge-gdat &&
619 cd mixed-merge-gdat &&
620 for i in $(test_seq $FIFTH_LAYER_SEQUENCE_START $FIFTH_LAYER_SEQUENCE_END)
623 git branch commits/$i || return 1
625 git commit-graph write --reachable --split --size-multiple 1 &&
626 test_line_count = 2 $graphdir/commit-graph-chain &&
627 test-tool read-graph >output &&
628 cat >expect <<-EOF &&
629 header: 43475048 1 $(test_oid oid_version) 5 1
630 num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
631 chunks: oid_fanout oid_lookup commit_metadata generation_data
632 options: read_generation_data
634 test_cmp expect output
638 test_expect_success
'write generation data chunk when commit-graph chain is replaced' '
639 git clone mixed mixed-replace &&
642 git commit-graph write --reachable --split=replace &&
643 test_path_is_file $graphdir/commit-graph-chain &&
644 test_line_count = 1 $graphdir/commit-graph-chain &&
645 verify_chain_files_exist $graphdir &&
646 graph_read_expect $(($NUM_FIRST_LAYER_COMMITS + $NUM_SECOND_LAYER_COMMITS)) &&
647 git commit-graph verify