Junio C Hamano <gitster@xxxxxxxxx> writes: > Thomas Rast <trast@xxxxxxxxxxxxxxx> writes: > >> @@ -333,7 +333,8 @@ then >> do >> sha1=$(git rev-parse "$ref"^0) >> test -f "$workdir"/../map/$sha1 && continue >> - ancestor=$(git rev-list -1 $ref -- "$filter_subdir") >> + ancestor=$(git rev-list --simplify-merges -1 \ >> + $ref -- "$filter_subdir") >> test "$ancestor" && echo $(map $ancestor) >> "$workdir"/../map/$sha1 >> done < "$tempdir"/heads >> fi > > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
