Junio C Hamano wrote: > > Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > > > >> - ancestor=$(git rev-list -1 $ref -- "$filter_subdir") > >> + ancestor=$(git rev-list --simplify-merges -1 \ > >> + $ref -- "$filter_subdir") > > > > Hmm, where does this preimage come from? > > Nevermind. You based this on top of the "fix ancestor discovery" patch. > > I'll squash these two and queue them in 'pu' for now. Please don't. I'm still convinced the "fix ancestor discovery" is a fix to current code that works independent of --simplify-merges. If you squash them, it cannot go into a release before --simplify-merges even if I manage to convince Dscho of this. Thanks. - Thomas -- Thomas Rast trast@xxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: This is a digitally signed message part.
