summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:35 -0800
commita47fcfe8712e3258d1c565cd654c9bd5312a5168 (patch)
tree4c724f397e890c6b233d253be279321505e2a3a4 /t/t3310-notes-merge-manual-resolve.sh
parentMerge branch 'ds/sparse-checkout-requires-per-worktree-config' (diff)
parentpack-bitmap-write.c: don't return without stop_progress() (diff)
downloadtgif-a47fcfe8712e3258d1c565cd654c9bd5312a5168.tar.xz
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/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions