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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 27, 2006, 08:31 UTC
Message-ID: <Pine.LNX.4.63.0606271016450.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <44A06A8D.7080202@catalyst.net.nz>

Hi,

I just cloned your repo, and as far as I can tell, the latest commit is on June 23rd. So your numbers should be the same as mine. But not all are.

On Tue, 27 Jun 2006, Martin Langhoff (CatalystIT) wrote:

Show 5 quoted lines

> Ok, I cooked the numbers up a bit, it was 60 total, with 10 merged upstream.
> Here's what I have today:
> 
>   $ git-cherry svnhead..master | grep -c '+'
>   52

Here, it is 51!

The problem I see: from the 53 non-merges in nzvleportfolio (who makes up your branch names anyway?), there are two already in upstream: e3f56c and 7e448c5c. So it really should be 51.

>   $ git-rev-list svnhead..master  | wc -l
>   61

Same on my repo.

>   $ ~/local/git/git-format-patch.sh  -o .patchesold svnhead master
>   ...
>   $ ls .patchesold | wc -l
>   52

I guess this propagates from git-cherry. (Did not test here, since I do not have an old git-format-patch.sh handy, and am too lazy to get the last version from my git repo.)

>   $ ~/local/git/git format-patch  -o .patchesnewall svnhead..master
>   ...
>   $ ls .patchesnewall/ | wc -l
>   53

Same on my repo. Correct, since "git rev-list --parents svnhead..master | grep -c \ .*\ " yields 8, which is exactly 61 - 53.

Show 5 quoted lines

>   $ ~/local/git/git format-patch --ignore-if-in-upstream -o .patchesnewignore
> svnhead..master
>   ...
>   $ ls .patchesnewignore | wc -l
>   52

Again, I get 51.

I do not know what is happening, but it could be that there was a bug fixed lately. I run a slightly modified version of 'next', updated about 15 minutes ago.

But anyway, looking at your numbers I take it that the new format-patch with --ignore-if-in-upstream has the same output as the old format-patch, right?

Ciao, Dscho