Re: [PATCH 3/2] format-patch: use clear_commit_marks() instead of some adhocery

Hi,

On Tue, 27 Jun 2006, Martin Langhoff wrote:

On 6/27/06, Johannes Schindelin [off-list ref] wrote:

quoted

Hi,

On Tue, 27 Jun 2006, Martin Langhoff wrote:

quoted

And it errors out with ignore-if-in-upstream:

 $ ./git format-patch --ignore-if-in-upstream -o .patches origin master
 fatal: Not a range.

Could you test with "origin..master" instead of "origin master"?

Funny you mention that! Now it works ;-) and it even produces the
patches I would expect.

The funny thing is: I did something to account for the old syntax, but 
only if you specified _one_ ref, not _two_. It would be easy, but is it 
needed? (I.e. are your fingers so trained on it?)

There is something strange though. I have a repo with ~150 pending 
patches to push, of which git-cherry spots ~100 as already merged 
upstream. So the old git-format-patch.sh would spit 50 patches, and the 
initial C version would do 150.

Now this version gives me 50 patches, regardless of
--ignore-if-in-upstream. Is that expected?

Hell, no! Something is really wrong there.

What does "git-rev-list their..my | wc" say?

Also, if the two heads are identical, it still says 'Fatal: Not a
range", but that isn't so important.

This is a consequence of my being too lazy to support the old "theirs 
mine" syntax (see above).

Ciao,
Dscho