[PATCH 3/5] rebase -i: Fix numbers in progress report
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 25, 2007, 15:43 UTC
- Message-ID
- <Pine.LNX.4.64.0709251642560.28395@racer.site>
- In-Reply-To
- <Pine.LNX.4.64.0709251640360.28395@racer.site>
Instead of counting all lines in done and todo, we now count the actions before outputting "$Rebasing ($count/$total)".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-rebase--interactive.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c850411..4f46a15 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -72,8 +72,8 @@ mark_action_done () { sed -e 1q < "$TODO" >> "$DONE" sed -e 1d < "$TODO" >> "$TODO".new mv -f "$TODO".new "$TODO" - count=$(($(wc -l < "$DONE"))) - total=$(($count+$(wc -l < "$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 }
-- 1.5.3.2.1057.gf4dc1