From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Feb 2022 23:47:35 +0000 (-0800)
Subject: Merge branch 'ab/only-single-progress-at-once'
X-Git-Tag: v2.36.0-rc0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a47fcfe8712e3258d1c565cd654c9bd5312a5168;p=thirdparty%2Fgit.git

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
---

a47fcfe8712e3258d1c565cd654c9bd5312a5168
diff --cc t/t5316-pack-delta-depth.sh
index df524f7b6d,bbe2e69c75..e9045009a1
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@@ -57,14 -57,15 +57,18 @@@ test_expect_success 'create series of p
  		git commit -m $i &&
  		cur=$(git rev-parse HEAD^{tree}) &&
  		{
 -			test -n "$prev" && echo "-$prev"
 -			echo $cur
 +			if test -n "$prev"
 +			then
 +				echo "-$prev"
 +			fi &&
 +			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
  '