diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:57 +0900 |
| commit | caf150ce7d60e4070292226ec208478b801b8d4b (patch) | |
| tree | 4468512d9f8492843cc7b4a6091790e513acde9f /t | |
| parent | Merge branch 'ms/fetch-follow-tag-optim' (diff) | |
| parent | commit-graph: add --[no-]progress to write and verify (diff) | |
| download | tgif-caf150ce7d60e4070292226ec208478b801b8d4b.tar.xz | |
Merge branch 'gs/commit-graph-progress'
* gs/commit-graph-progress:
commit-graph: add --[no-]progress to write and verify
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 36 | ||||
| -rwxr-xr-x | t/t5324-split-commit-graph.sh | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index ab3eccf0fa..df3fed3a08 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -124,6 +124,42 @@ test_expect_success 'Add more commits' ' git repack ' +test_expect_success 'commit-graph write progress off for redirected stderr' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph write 2>err && + test_line_count = 0 err +' + +test_expect_success 'commit-graph write force progress on for stderr' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph write --progress 2>err && + test_file_not_empty err +' + +test_expect_success 'commit-graph write with the --no-progress option' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph write --no-progress 2>err && + test_line_count = 0 err +' + +test_expect_success 'commit-graph verify progress off for redirected stderr' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph verify 2>err && + test_line_count = 0 err +' + +test_expect_success 'commit-graph verify force progress on for stderr' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph verify --progress 2>err && + test_file_not_empty err +' + +test_expect_success 'commit-graph verify with the --no-progress option' ' + cd "$TRASH_DIRECTORY/full" && + git commit-graph verify --no-progress 2>err && + test_line_count = 0 err +' + # Current graph structure: # # __M3___ diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index e2c39533d3..115aabd141 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -320,7 +320,7 @@ test_expect_success 'add octopus merge' ' git merge commits/3 commits/4 && git branch merge/octopus && git commit-graph write --reachable --split && - git commit-graph verify 2>err && + git commit-graph verify --progress 2>err && test_line_count = 3 err && test_i18ngrep ! warning err && test_line_count = 3 $graphdir/commit-graph-chain |