Re: [PATCH] rebase -i: fix numbering in squash message

2018-08-16 Thread Johannes Schindelin
Hi, On Wed, 15 Aug 2018, Junio C Hamano wrote: > Phillip Wood writes: > > >> I wonder if it makes it easier to read, understand and maintain if > >> there were a local variable that gets opts->current_fixup_count+2 at > >> the beginning of the function, make these three places refer to that >

Re: [PATCH] rebase -i: fix numbering in squash message

2018-08-15 Thread Junio C Hamano
Phillip Wood writes: >> I wonder if it makes it easier to read, understand and maintain if >> there were a local variable that gets opts->current_fixup_count+2 at >> the beginning of the function, make these three places refer to that >> variable, and move the increment of

Re: [PATCH] rebase -i: fix numbering in squash message

2018-08-15 Thread Phillip Wood
Hi Junio On 15/08/2018 19:05, Junio C Hamano wrote: > > Phillip Wood writes: > >> From: Phillip Wood >> >> Commit e12a7ef597 ("rebase -i: Handle "combination of commits" with >> GETTEXT_POISON", 2018-04-27) changed the way that individual commit >> messages are labelled when squashing

Re: [PATCH] rebase -i: fix numbering in squash message

2018-08-15 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > Commit e12a7ef597 ("rebase -i: Handle "combination of 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

[PATCH] rebase -i: fix numbering in squash message

2018-08-15 Thread Phillip Wood
From: Phillip Wood Commit e12a7ef597 ("rebase -i: Handle "combination of 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