summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-30 10:50:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-30 10:50:45 -0700
commitfa03d9c6990aa0f0ca675e89bde1861988d0c517 (patch)
treed21d8088b91d4b3a0faa64e32077194ff87005dd
parentMerge branch 'js/rebase-deprecate-preserve-merges' (diff)
parentprogress: avoid empty line when breaking the progress line (diff)
downloadtgif-fa03d9c6990aa0f0ca675e89bde1861988d0c517.tar.xz
Merge branch 'sg/progress-off-by-one-fix'
A brown-paper-bag bugfix to a change already in 'master'. * sg/progress-off-by-one-fix: progress: avoid empty line when breaking the progress line
-rw-r--r--progress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/progress.c b/progress.c
index 0318bdd41b..a2e8cf64a8 100644
--- a/progress.c
+++ b/progress.c
@@ -128,7 +128,7 @@ static void display(struct progress *progress, uint64_t n, const char *done)
(int) clear_len, eol);
} else if (!done && cols < progress_line_len) {
clear_len = progress->title_len + 1 < cols ?
- cols - progress->title_len : 0;
+ cols - progress->title_len - 1 : 0;
fprintf(stderr, "%s:%*s\n %s%s",
progress->title, (int) clear_len, "",
counters_sb->buf, eol);