From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Aug 2008 02:13:26 GMT
Subject: Re: [PATCH] filter-branch: use --simplify-merges
Message-ID: <7v7iant1yx.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <7vljz3t2ts.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Thomas Rast <trast@student.ethz.ch> 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.