Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-15 Thread Junio C Hamano
Junio C Hamano writes: > Phillip Wood writes: > >> On 14/08/2019 22:20, SZEDER Gábor wrote: >> >> I changed the sequencer to always commit the cherry-pick and then run >> 'git commit --amend' for rewords [1]. Running >> >> time env GIT_EDITOR=true GIT_SEQUENCE_EDITOR='sed -i >> s/pick/rewor

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-15 Thread Junio C Hamano
Phillip Wood writes: > On 14/08/2019 22:20, SZEDER Gábor wrote: > > I changed the sequencer to always commit the cherry-pick and then run > 'git commit --amend' for rewords [1]. Running > > time env GIT_EDITOR=true GIT_SEQUENCE_EDITOR='sed -i > s/pick/reword/' ../bin-wrappers/git rebase -i

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-15 Thread Phillip Wood
On 14/08/2019 22:20, SZEDER Gábor wrote: On Mon, Aug 12, 2019 at 09:28:52PM +0100, Phillip Wood wrote: Save the updated commit message, and after the editor opens up the third commit's log message, check again where HEAD is pointing to now: ~/tmp/reword (master +|REBASE-i 2/3)$ head -n1 .git

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-14 Thread SZEDER Gábor
On Wed, Aug 14, 2019 at 10:45:22PM +0200, Johannes Schindelin wrote: > However, I am reluctant to accept the performance impact: in the long > run, I would love to have an interactive rebase that actually only > updates `HEAD` (and the worktree) when interrupting the rebase (via > `break` or `edit`

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-14 Thread SZEDER Gábor
On Mon, Aug 12, 2019 at 09:28:52PM +0100, Phillip Wood wrote: > >Save the updated commit message, and after the editor opens up the > >third commit's log message, check again where HEAD is pointing to now: > > > > ~/tmp/reword (master +|REBASE-i 2/3)$ head -n1 .git/COMMIT_EDITMSG > > third > >

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-14 Thread Johannes Schindelin
Hi, On Mon, 12 Aug 2019, Phillip Wood wrote: > On 12/08/2019 18:50, SZEDER Gábor wrote: > > > > When running interactive rebase to reword a commit message, I would > > expect that the commit whose message I'm rewording is checked out. > > This is not quite the case when rewording multiple subsequ

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-12 Thread Phillip Wood
On 12/08/2019 18:50, SZEDER Gábor wrote: When running interactive rebase to reword a commit message, I would expect that the commit whose message I'm rewording is checked out. This is not quite the case when rewording multiple subsequent commit messages. Let's start with four commits, and start

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-12 Thread SZEDER Gábor
On Mon, Aug 12, 2019 at 11:17:01AM -0700, Junio C Hamano wrote: > SZEDER Gábor writes: > > > ... > > So far so good. > > Save the updated commit message, and after the editor opens up the > > third commit's log message, check again where HEAD is pointing to now: > > > > ~/tmp/reword (master +|R

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-12 Thread Junio C Hamano
SZEDER Gábor writes: > ... > So far so good. > Save the updated commit message, and after the editor opens up the > third commit's log message, check again where HEAD is pointing to now: > > ~/tmp/reword (master +|REBASE-i 2/3)$ head -n1 .git/COMMIT_EDITMSG > third > ~/tmp/reword (master +

minor interactive rebase regression: HEAD points to wrong commit while rewording

2019-08-12 Thread SZEDER Gábor
When running interactive rebase to reword a commit message, I would expect that the commit whose message I'm rewording is checked out. This is not quite the case when rewording multiple subsequent commit messages. Let's start with four commits, and start an interactive rebase from the first comm