From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Martin Langhoff (CatalystIT)" <martin@catalyst.net.nz>
Cc: Martin Langhoff <martin.langhoff@gmail.com>,
git@vger.kernel.org, junkio@cox.net
Subject: Re: [PATCH 3/2] format-patch: use clear_commit_marks() instead of some adhocery
Date: Tue, 27 Jun 2006 01:21:47 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.63.0606270117470.29667@wbgn013.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <44A06A8D.7080202@catalyst.net.nz>
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?"
next prev parent reply other threads:[~2006-06-26 23:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-25 1:50 [PATCH 0/2] resurrect format-patch's patch id checking Johannes Schindelin
2006-06-26 15:33 ` [PATCH 3/2] format-patch: use clear_commit_marks() instead of some adhocery Johannes Schindelin
2006-06-26 16:09 ` Junio C Hamano
2006-06-26 22:44 ` Johannes Schindelin
2006-06-26 22:20 ` Martin Langhoff
2006-06-26 22:39 ` Johannes Schindelin
2006-06-26 22:50 ` Martin Langhoff
2006-06-26 23:00 ` Johannes Schindelin
2006-06-26 23:04 ` Junio C Hamano
2006-06-26 23:14 ` [PATCH] format-patch: support really old non-range syntax, with a warning Johannes Schindelin
2006-06-26 23:15 ` [PATCH 3/2] format-patch: use clear_commit_marks() instead of some adhocery Martin Langhoff (CatalystIT)
2006-06-26 23:21 ` Johannes Schindelin [this message]
2006-06-27 8:31 ` Johannes Schindelin
2006-06-27 9:52 ` Martin Langhoff
2006-06-27 10:54 ` Johannes Schindelin
2006-06-27 11:09 ` Martin Langhoff
2006-06-27 12:39 ` Johannes Schindelin
2006-06-26 22:48 ` Junio C Hamano
2006-06-26 22:57 ` Johannes Schindelin
2006-06-27 20:38 ` [PATCH] " Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.63.0606270117470.29667@wbgn013.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=martin.langhoff@gmail.com \
--cc=martin@catalyst.net.nz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).