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

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Jun 26, 2006, 22:50 UTC
Message-ID: <46a038f90606261550p145b20a6gbe960e0abc16e8a4@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.63.0606270038200.29667@wbgn013.biozentrum.uni-wuerzburg.de>

On 6/27/06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 10 quoted lines

> Hi,
>
> On Tue, 27 Jun 2006, Martin Langhoff wrote:
>
> > 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. 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?

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

cheers,

martin