diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:17 (GMT) |
| commit | f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d (patch) | |
| tree | d8f29bb6c7f7816999cfed9f690f7b65a81b487f /git-rebase--interactive.sh | |
| parent | 8c2ea51254b41810edf4ee1ac8b2272a784b15df (diff) | |
| parent | 2185d3b7ad2ccdfe220d5c4139ff671a66fe7d80 (diff) | |
| download | git-f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d.zip git-f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d.tar.gz git-f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d.tar.bz2 | |
Merge branch 'es/rebase-i-count-todo' into maint
"git rebase -i" recently started to include the number of
commits in the insn sheet to be processed, but on a platform
that prepends leading whitespaces to "wc -l" output, the numbers
are shown with extra whitespaces that aren't necessary.
* es/rebase-i-count-todo:
rebase-interactive: re-word "item count" comment
rebase-interactive: suppress whitespace preceding item count
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c96b984..f7deeb0 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1030,10 +1030,11 @@ test -n "$autosquash" && rearrange_squash "$todo" test -n "$cmd" && add_exec_commands "$todo" todocount=$(git stripspace --strip-comments <"$todo" | wc -l) +todocount=${todocount##* } cat >>"$todo" <<EOF -$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s)) +$comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s)) EOF append_todo_help git stripspace --comment-lines >>"$todo" <<\EOF |