kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-03-23 11:23:17 -07:00
parent 8c2ea51254 2185d3b7ad
commit f63ed085e2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -1030,10 +1030,11 @@ test -n "$autosquash" && rearrange_squash "$todo"
test -n "$cmd" && add_exec_commands "$todo" test -n "$cmd" && add_exec_commands "$todo"


todocount=$(git stripspace --strip-comments <"$todo" | wc -l) todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
todocount=${todocount##* }


cat >>"$todo" <<EOF cat >>"$todo" <<EOF


$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s)) $comment_char Rebase $shortrevisions onto $shortonto ($todocount command(s))
EOF EOF
append_todo_help append_todo_help
git stripspace --comment-lines >>"$todo" <<\EOF git stripspace --comment-lines >>"$todo" <<\EOF

9
t/t3404-rebase-interactive.sh
View File

@ -1046,4 +1046,13 @@ test_expect_success 'respect core.abbrev' '
test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list) 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 test_done