From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2017 23:12:13 +0000 (-0800)
Subject: Merge branch 'jk/rebase-i-squash-count-fix'
X-Git-Tag: v2.12.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5c924692cd1c45e9c1281516e9823f7c5c3c7cd8?ds=inline;hp=-c

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

"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
---

5c924692cd1c45e9c1281516e9823f7c5c3c7cd8
diff --combined git-rebase--interactive.sh
index b0a6f2b7ba,4bca73c94c..4734094a3f
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -93,17 -93,8 +93,17 @@@ eval 
  GIT_CHERRY_PICK_HELP="$resolvemsg"
  export GIT_CHERRY_PICK_HELP
  
 -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1)
 -: ${comment_char:=#}
 +comment_char=$(git config --get core.commentchar 2>/dev/null)
 +case "$comment_char" in
 +'' | auto)
 +	comment_char="#"
 +	;;
 +?)
 +	;;
 +*)
 +	comment_char=$(echo "$comment_char" | cut -c1)
 +	;;
 +esac
  
  warn () {
  	printf '%s\n' "$*" >&2
@@@ -425,7 -416,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 \
@@@ -437,8 -428,7 +437,8 @@@
  			}' <"$squash_msg".bak
  		} >"$squash_msg"
  	else
 -		commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
 +		commit_message HEAD >"$fixup_msg" ||
 +		die "$(eval_gettext "Cannot write \$fixup_msg")"
  		count=2
  		{
  			printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"