From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org,
Christian Couder <christian.couder@gmail.com>,
Bruce Korb <bruce.korb@gmail.com>
Subject: Re: [PATCH] format-patch: dereference tags with --ignore-if-in-upstream
Date: Mon, 1 Jun 2015 13:47:12 -0400 [thread overview]
Message-ID: <20150601174712.GA18364@peff.net> (raw)
In-Reply-To: <xmqq6177728a.fsf@gitster.dls.corp.google.com>
On Mon, Jun 01, 2015 at 10:44:21AM -0700, Junio C Hamano wrote:
> > Shouldn't you ensure o1 and o2 are commits here?
>
> Heh, I should have read the remainder of the thread before
> responding.
>
> How about doing it this way? We know and trust that existing
> revision traversal machinery is doing the right thing, and it is
> only that the clear_commit_marks() calls are botched.
Yeah, I think this matches the recommendation I gave in the last round.
I do still think we could get rid of this "second" traversal entirely in
favor of using "--cherry", but that is a much larger topic. Even if
somebody wants to pursue that, the immediate fix should look like this.
-Peff
next prev parent reply other threads:[~2015-06-01 17:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-31 19:13 seg fault in "git format-patch" Bruce Korb
2015-05-31 20:26 ` Christian Couder
2015-05-31 20:41 ` Bruce Korb
2015-05-31 20:45 ` Bruce Korb
2015-05-31 23:14 ` Christian Couder
2015-05-31 23:53 ` Christian Couder
2015-06-01 0:01 ` Christian Couder
2015-06-01 1:03 ` [PATCH] format-patch: dereference tags with --ignore-if-in-upstream brian m. carlson
2015-06-01 10:20 ` Jeff King
2015-06-01 11:22 ` brian m. carlson
2015-06-01 11:47 ` Jeff King
2015-06-01 14:56 ` Junio C Hamano
2015-06-01 17:44 ` Junio C Hamano
2015-06-01 17:47 ` Jeff King [this message]
2015-06-01 20:35 ` Junio C Hamano
2015-06-01 22:34 ` brian m. carlson
2015-06-01 22:46 ` Junio C Hamano
2015-06-01 17:58 ` Junio C Hamano
2015-06-01 13:44 ` seg fault in "git format-patch" Christian Couder
2015-06-01 14:17 ` Christian Couder
2015-06-01 14:47 ` Bruce Korb
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150601174712.GA18364@peff.net \
--to=peff@peff.net \
--cc=bruce.korb@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/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.
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 NNTP newsgroup(s).