Merge branch 'ok/rebase-i-count-todo'

* ok/rebase-i-count-todo: Show number of TODO items for interactive rebase
git-mirror · Dec 22, 2014 · 3701aa0 · 3701aa0
2 parents aa9066f + 97f05f4
commit 3701aa0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -1031,9 +1031,11 @@ 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)
+
 cat >>"$todo" <<EOF
 
-$comment_char Rebase $shortrevisions onto $shortonto
+$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
 EOF
 append_todo_help
 git stripspace --comment-lines >>"$todo" <<\EOF