undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2017-01-18 15:12:13 -08:00
commit 5c924692cd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -425,7 +425,7 @@ update_squash_messages () {
if test -f "$squash_msg"; then if test -f "$squash_msg"; then
mv "$squash_msg" "$squash_msg".bak || exit mv "$squash_msg" "$squash_msg".bak || exit
count=$(($(sed -n \ 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)) -e "q" < "$squash_msg".bak)+1))
{ {
printf '%s\n' "$comment_char $(eval_ngettext \ printf '%s\n' "$comment_char $(eval_ngettext \