[PATCH] Squelch bogus progress output from git-rebase--interactive

Junio C Hamano· Jan 15, 2008, 04:04 UTC · lore

The command repeats "Rebasing (1/1)" many times even when there is only one task remaining, because mark_action_done() is called to skip comment and empty lines in the TODO file.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-rebase--interactive.sh |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Show changes to git-rebase--interactive.sh +7 −2

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index acdcc54..402ff37 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -73,14 +73,19 @@ comment_for_reflog () {
 	esac
 }
 
+last_count=
 mark_action_done () {
 	sed -e 1q < "$TODO" >> "$DONE"
 	sed -e 1d < "$TODO" >> "$TODO".new
 	mv -f "$TODO".new "$TODO"
 	count=$(($(grep -ve '^$' -e '^#' < "$DONE" | wc -l)))
 	total=$(($count+$(grep -ve '^$' -e '^#' < "$TODO" | wc -l)))
-	printf "Rebasing (%d/%d)\r" $count $total
-	test -z "$VERBOSE" || echo
+	if test "$last_count" != "$count"
+	then
+		last_count=$count
+		printf "Rebasing (%d/%d)\r" $count $total
+		test -z "$VERBOSE" || echo
+	fi
 }
 
 make_patch () {

-- 
1.5.4.rc3.10.g471a

Johannes Schindelin· Jan 15, 2008, 11:22 UTC · re: Junio C Hamano · lore

Re: [PATCH] Squelch bogus progress output from git-rebase--interactive

Hi,

On Mon, 14 Jan 2008, Junio C Hamano wrote:

Show 5 quoted lines

> The command repeats "Rebasing (1/1)" many times even when
> there is only one task remaining, because mark_action_done() is
> called to skip comment and empty lines in the TODO file.
> 
> This should fix it.

Yes, it should.

Thanks, Dscho

patchSquelch bogus progress output from git-rebase--interactive