summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-09-19 21:01:38 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-20 12:25:05 -0700
commit6b89a34c89fc763292f06012318b852b74825619 (patch)
tree3cdafdcd2fe60a89e6affa786221d507a39ef574 /git-rebase--merge.sh
parentcommit-graph verify: add progress output (diff)
downloadtgif-6b89a34c89fc763292f06012318b852b74825619.tar.xz
gc: fix regression in 7b0f229222 impacting --quiet
Fix a regression in my recent 7b0f229222 ("commit-graph write: add progress output", 2018-09-17). The newly added progress output for "commit-graph write" didn't check the --quiet option. Do so, and add a test asserting that this works as expected. Since the TTY prequisite isn't available everywhere let's add a version of this that both requires and doesn't require that. This test might be overly specific and will break if new progress output is added, but I think it'll serve as a good reminder to test the undertested progress mode(s). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Helped-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions