summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:13 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:13 -0800
commit5c924692cd1c45e9c1281516e9823f7c5c3c7cd8 (patch)
tree8e1a41e34caeeb0126e7b0d775e0020c5d4c7017 /git-rebase--interactive.sh
parent256d3dabbd04d4b35d36a68ef0633a4e6e7a07fa (diff)
parent356b8ecff101e3f763619d74f344ede3204c7991 (diff)
downloadgit-5c924692cd1c45e9c1281516e9823f7c5c3c7cd8.tar.gz
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
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b0a6f2b7ba..4734094a3f 100644
--- 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 \