]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 15ef693) | patch
rebase -i: fix numbering in squash message
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 15 Aug 2018 09:41:25 +0000 (10:41 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 17:50:24 +0000 (10:50 -0700)
commitdd2e36ebaccd6dc2ca4d37759248ce9bbdf9113e
treea64918927a3d015344978c1628b0556b1adcd1c0tree | snapshot
parent15ef69314d54945471603223bef00091673b5725commit | diff
rebase -i: fix numbering in squash message

Commit e12a7ef597 ("rebase -i: Handle "combination of <n> commits" with
GETTEXT_POISON", 2018-04-27) changed the way that individual commit
messages are labelled when squashing commits together. In doing so a
regression was introduced where the numbering of the messages is off by
one. This commit fixes that and adds a test for the numbering.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | blame | history
t/t3418-rebase-continue.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.