mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'es/rebase-i-count-todo'
"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
This commit is contained in:
commit
fbcbcee51c
|
@ -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
|
||||
|
|
|
@ -1046,4 +1046,13 @@ test_expect_success 'respect core.abbrev' '
|
|||
test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
|
||||
'
|
||||
|
||||
test_expect_success 'todo count' '
|
||||
write_script dump-raw.sh <<-\EOF &&
|
||||
cat "$1"
|
||||
EOF
|
||||
test_set_editor "$(pwd)/dump-raw.sh" &&
|
||||
git rebase -i HEAD~4 >actual &&
|
||||
grep "^# Rebase ..* onto ..* ([0-9]" actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue