Merge branch 'jk/rebase-i-squash-count-fix' into maint

gitster · gitster · commit 2b3f61dc8b5e · 2017-01-31T13:32:07.000-08:00
"git rebase -i" with a recent update started showing an incorrect
count when squashing more than 10 commits.

* jk/rebase-i-squash-count-fix:
  rebase--interactive: count squash commits above 10 correctly
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -425,7 +425,7 @@ update_squash_messages () {
 	if test -f "$squash_msg"; then
 		mv "$squash_msg" "$squash_msg".bak || exit
 		count=$(($(sed -n \
-			-e "1s/^$comment_char.*\([0-9][0-9]*\).*/\1/p" \
+			-e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \
 			-e "q" < "$squash_msg".bak)+1))
 		{
 			printf '%s\n' "$comment_char $(eval_ngettext \

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ update_squash_messages () {`
`425`	`425`	`if test -f "$squash_msg"; then`
`426`	`426`	`mv "$squash_msg" "$squash_msg".bak \|\| exit`
`427`	`427`	`count=$(($(sed -n \`
`428`		`- -e "1s/^$comment_char.\([0-9][0-9]\).*/\1/p" \`
	`428`	`+ -e "1s/^$comment_char[^0-9]\([0-9][0-9]\).*/\1/p" \`
`429`	`429`	`-e "q" < "$squash_msg".bak)+1))`
`430`	`430`	`{`
`431`	`431`	`printf '%s\n' "$comment_char $(eval_ngettext \`