Johannes Schindelin wrote:
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?)
My fingers are retrainable ;-)
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?
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
$ git-rev-list svnhead..master | wc -l
61
$ ~/local/git/git-format-patch.sh -o .patchesold svnhead master
...
$ ls .patchesold | wc -l
52
$ ~/local/git/git format-patch -o .patchesnewall svnhead..master
...
$ ls .patchesnewall/ | wc -l
53
$ ~/local/git/git format-patch --ignore-if-in-upstream -o
.patchesnewignore svnhead..master
...
$ ls .patchesnewignore | wc -l
52
This is a public repo --
master tracks origin which is
http://git.catalyst.net.nz/git/elgg-r2.git#nzvleportfolio
svnhead is
http://git.catalyst.net.nz/git/elgg-r2.git#svnhead
cheers,
m
--
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington
WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224 MOB: +64(21)364-017
Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------
-
: 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