diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
| commit | a47fcfe8712e3258d1c565cd654c9bd5312a5168 (patch) | |
| tree | 4c724f397e890c6b233d253be279321505e2a3a4 /t/t5316-pack-delta-depth.sh | |
| parent | 6249ce2d1b9b60e7aa630d370e68c87ef6331629 (diff) | |
| parent | b3118a56f99ca0ec872b84dc760a0dc778f3890e (diff) | |
| download | git-a47fcfe8712e3258d1c565cd654c9bd5312a5168.zip git-a47fcfe8712e3258d1c565cd654c9bd5312a5168.tar.gz git-a47fcfe8712e3258d1c565cd654c9bd5312a5168.tar.bz2 | |
Merge branch 'ab/only-single-progress-at-once'
Further tweaks on progress API.
* ab/only-single-progress-at-once:
pack-bitmap-write.c: don't return without stop_progress()
progress API: unify stop_progress{,_msg}(), fix trace2 bug
progress.c: refactor stop_progress{,_msg}() to use helpers
progress.c: use dereferenced "progress" variable, not "(*p_progress)"
progress.h: format and be consistent with progress.c naming
progress.c tests: test some invalid usage
progress.c tests: make start/stop commands on stdin
progress.c test helper: add missing braces
leak tests: fix a memory leak in "test-progress" helper
Diffstat (limited to 't/t5316-pack-delta-depth.sh')
| -rwxr-xr-x | t/t5316-pack-delta-depth.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh index df524f7..e904500 100755 --- a/t/t5316-pack-delta-depth.sh +++ b/t/t5316-pack-delta-depth.sh @@ -64,7 +64,11 @@ test_expect_success 'create series of packs' ' echo $cur && echo "$(git rev-parse :file) file" } | git pack-objects --stdout >tmp && - git index-pack --stdin --fix-thin <tmp || return 1 + GIT_TRACE2_EVENT=$PWD/trace \ + git index-pack -v --stdin --fix-thin <tmp || return 1 && + grep -c region_enter.*progress trace >enter && + grep -c region_leave.*progress trace >leave && + test_cmp enter leave && prev=$cur done ' |