Hi, On Tue, 27 Jun 2006, Martin Langhoff (CatalystIT) wrote: > > > 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 That is very, very strange. One more! Do you have any idea which patch it is (53 being one more than 52 I suspect there is one slipping through)? > $ ~/local/git/git format-patch --ignore-if-in-upstream -o .patchesnewignore > svnhead..master > ... > $ ls .patchesnewignore | wc -l > 52 Could it be that the other patches are merges? format-patch _must_ ignore these. > 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 Even if I do not use cogito, I will fetch them. However, that must wait for tomorrow, as I can no longer keep awake. Ciao, Dscho "where do you put the middle name if your nick is only one word?" - : 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