From: Johannes Schindelin Date: Sat, 28 May 2016 06:39:48 GMT Subject: Re: Small rerere in rebase regression Message-ID: In-Reply-To: <574875A5.9040303@kdbg.org> Hi Hannes, On Fri, 27 May 2016, Johannes Sixt wrote: > Subject: [PATCH] rebase -i: remove an unnecessary 'rerere' invocation > > Interactive rebase uses 'git cherry-pick' and 'git merge' to replay > commits. Both invoke the 'rerere' machinery when they fail due to merge > conflicts. Note that all code paths with these two commands also invoke > the shell function die_with_patch when the commands fail. > > Since commit 629716d2 ("rerere: do use multiple variants") the second > operation of the rerere machinery can be observed by a duplicated > message "Recorded preimage for 'file'". This second operation records > the same preimage as the first one and, hence, only wastes cycles. > Remove the 'git rerere' invocation from die_with_patch. > > Shell function die_with_patch can be called after the failure of > "git commit", too, which also calls into the rerere machinery, but it > does so only after a successful commit to record the resolution. > Therefore, it is wrong to call 'git rerere' from die_with_patch after > "git commit" fails. > > Signed-off-by: Johannes Sixt ACK Ciao, Dscho