diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-09 04:53:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-09 04:53:26 (GMT) |
| commit | c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3 (patch) | |
| tree | 78b36cf20a92eb637f6a2d5be57c53bcde7818cd /t | |
| parent | abac91e3aa0fffb5901498923e79d4bcbdb96c46 (diff) | |
| parent | ec6a8f9705cb61956f7fac61a4c0e27d9ae4bbd5 (diff) | |
| download | git-c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3.zip git-c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3.tar.gz git-c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3.tar.bz2 | |
Merge branch 'jk/index-pack-hotfixes'
Hotfix and clean-up for the jt/threaded-index-pack topic that has
graduated to v2.29-rc0.
* jk/index-pack-hotfixes:
index-pack: make get_base_data() comment clearer
index-pack: drop type_cas mutex
index-pack: restore "resolving deltas" progress meter
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5302-pack-index.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index c92e553..7c9d687 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -277,4 +277,11 @@ test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in grep "^warning:.* expected .tagger. line" err ' +test_expect_success 'index-pack -v --stdin produces progress for both phases' ' + pack=$(git pack-objects --all pack </dev/null) && + GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err && + test_i18ngrep "Receiving objects" err && + test_i18ngrep "Resolving deltas" err +' + test_done |