Hi Junio, On Thu, 19 Jul 2018, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > >> I would like to ask you to reinstate the post-rewrite hook, as it still > >> improves the situation over the current one. > > > > Without post-rewrite I seem to be getting correct amlog entries for > > commits created by "git rebase"; do our rebase--am backend still > > trigger post-applypatch hook in its "am" phase to apply the patches > > created with "format-patch"? > > That was a wrong line of thought that led to a dead end. format-patch > won't recreate Message-Id to its output from notes/amlog, so even if > the "format-patch --stdout | am" pipeline inside rebase-am triggered > the post-applypatch hook, it would not have a chance to carry the > notes forward that way. > > What was really happening was I have > > $ git config --list | grep amlog > notes.rewriteref=refs/notes/amlog > > and that ought to be sufficient to carry "commit-to-original-msg-id" > entries across rebases. And it seems to correctly work. I however > suspect that "cherry-pick A..B" may lose the notes, but I haven't > checked. AFAICT there is at least one scenario where you run `rebase -i`, the notes get updated, and of course the *reverse mapping* does *not* get updated: you have a mapping both from commit to Message-Id *and crucially* from Message-Id to commit. The automatic rewrite of commit notes in `rebase -i` tackles only the commit notes, obviously, not the reverse. Hence the post-rewrite hook I think I already suggested at least once in a previous reply. Ciao, Dscho
