diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:48:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 21:48:38 (GMT) |
| commit | 6b9114c649495bce5f9f88a519672c9d56ee6d81 (patch) | |
| tree | 91ff31e503288f2af6ab9b4eb05166d78fbd9943 /git-rebase--interactive.sh | |
| parent | 0d3279962acab475a523cfde04a79761ff12f147 (diff) | |
| parent | d94975185947bd8594a4a8564ec6040e8c242b70 (diff) | |
| download | git-6b9114c649495bce5f9f88a519672c9d56ee6d81.zip git-6b9114c649495bce5f9f88a519672c9d56ee6d81.tar.gz git-6b9114c649495bce5f9f88a519672c9d56ee6d81.tar.bz2 | |
Merge branch 'js/rebase-i-progress-tidy'
Regression fix for an i18n topic already in 'master'.
* js/rebase-i-progress-tidy:
rebase-interactive: trim leading whitespace from progress count
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ded4595..e2da524 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -121,7 +121,7 @@ mark_action_done () { sed -e 1q < "$todo" >> "$done" sed -e 1d < "$todo" >> "$todo".new mv -f "$todo".new "$todo" - new_count=$(git stripspace --strip-comments <"$done" | wc -l) + new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) )) echo $new_count >"$msgnum" total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) echo $total >"$end" |