зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/rebase-i-squash-count-fix' into maint
"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:
Коммит
2b3f61dc8b
|
@ -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 \
|
||||
|
|
Загрузка…
Ссылка в новой задаче