[PATCH v2 4/4] git rebase -i: Use newly added --count-lines option for stripspace
- From
Tobias Klauser <tklauser@distanz.ch>
- Date
- Oct 16, 2015, 15:16 UTC
- Message-ID
- <1445008605-16534-5-git-send-email-tklauser@distanz.ch>
- In-Reply-To
- <1445008605-16534-1-git-send-email-tklauser@distanz.ch>
Use the newly added --count-lines option for 'git stripspace' to count lines instead of piping the entire output to 'wc -l'.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch> ---
Implements the small project idea from https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#implement_.27--count-lines.27_in_.27git_stripspace.27
git-rebase--interactive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index d65c06e..f80da30 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -120,9 +120,9 @@ 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 --count-lines <"$done") echo $new_count >"$msgnum" - total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) + total=$(($new_count + $(git stripspace --strip-comments --count-lines <"$todo"))) echo $total >"$end" if test "$last_count" != "$new_count" then @@ -1243,7 +1243,7 @@ test -s "$todo" || echo noop >> "$todo" test -n "$autosquash" && rearrange_squash "$todo" test -n "$cmd" && add_exec_commands "$todo" -todocount=$(git stripspace --strip-comments <"$todo" | wc -l) +todocount=$(git stripspace --strip-comments --count-lines <"$todo") todocount=${todocount##* } cat >>"$todo" <<EOF
-- 2.6.1.148.g7927db1