From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <git@drmicha•warpmail.net>
Cc: git@vger•kernel.org
Subject: Re: [PATCHv2 0/9] --left/right-only and --cherry-mark
Date: Wed, 09 Mar 2011 13:49:39 -0800 [thread overview]
Message-ID: <7vtyfc7ymk.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <cover.1299499429.git.git@drmicha.warpmail.net> (Michael J. Gruber's message of "Mon, 7 Mar 2011 13:31:34 +0100")
Michael J Gruber <git@drmicha•warpmail.net> writes:
> This is a replacement for mg/rev-list-one-side-only in pu.
> The --left/right-only related commits (1-4/9) are unchanged.
I like the general idea of marking the equivalent ones instead of outright
discarding the commits in the cherry_pick_list() function.
It might be a good idea to record the correspondence between equivalent
commits in some way; the current topic does not need that information in
order to produce its output, so that is something other people can build
on top of this topic in the future.
There is only one minor point that nagged me while reading this series.
Conceptually revs->cherry_mark ought to be a subset of revs->cherry_pick
and the code shouldn't have to do something like this:
if (revs->cherry_pick || revs->cherry_mark)
cherry_pick_list();
Instead, the code should arrange that revs->cherry_pick is always set
when revs->cherry_mark is set before the calling application enters the
loop to call get_revision().
But that would make the command line parsing more cumbersome (you would
either waste one bit so that you can tell if you saw --cherry-pick on the
command line, or keep the version of parser in this series as-is, and add
postprocessing code to flip revs->cherry_pick on when revs->cherry_mark
was given in prepare_revision_walk()), and I understand that is why you
did it that way?
Thanks.
next prev parent reply other threads:[~2011-03-09 21:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 12:31 [PATCHv2 0/9] --left/right-only and --cherry-mark Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 1/9] revlist.c: introduce --left/right-only for unsymmetric picking Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 2/9] t6007: Make sure we test --cherry-pick Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 3/9] rev-list: documentation and test for --left/right-only Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 4/9] rev-list: --left/right-only are mutually exclusive Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 5/9] rev-list/log: factor out revision mark generation Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 6/9] revision.c: introduce --cherry-mark Michael J Gruber
2011-03-09 21:29 ` Junio C Hamano
2011-03-10 8:23 ` [PATCHv2+ " Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 7/9] rev-list: documentation and test for --cherry-mark Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 8/9] log --cherry: a synonym Michael J Gruber
2011-03-07 12:31 ` [PATCHv2 9/9] t6007: test rev-list --cherry Michael J Gruber
2011-03-09 21:49 ` Junio C Hamano [this message]
2011-03-10 8:08 ` [PATCHv2 0/9] --left/right-only and --cherry-mark Michael J Gruber
2011-03-10 9:56 ` Junio C Hamano
2011-03-10 10:48 ` Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 00/10] " Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 01/10] revlist.c: introduce --left/right-only for unsymmetric picking Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 02/10] t6007: Make sure we test --cherry-pick Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 03/10] rev-list: documentation and test for --left/right-only Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 04/10] rev-list: --left/right-only are mutually exclusive Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 05/10] rev-list/log: factor out revision mark generation Michael J Gruber
2011-03-10 14:44 ` [PATCHv3 06/10] revision.c: introduce --cherry-mark Michael J Gruber
2011-03-10 14:45 ` [PATCHv3 07/10] rev-list: documentation and test for --cherry-mark Michael J Gruber
2011-03-10 14:45 ` [PATCHv3 08/10] log --cherry: a synonym Michael J Gruber
2011-03-10 14:45 ` [PATCHv3 09/10] t6007: test rev-list --cherry Michael J Gruber
2011-03-10 14:45 ` [PATCHv3 10/10] git-log: put space after commit mark Michael J Gruber
2011-03-10 18:22 ` [PATCHv2 0/9] --left/right-only and --cherry-mark Junio C Hamano
2011-03-11 7:52 ` Michael J Gruber
2011-03-11 8:02 ` Junio C Hamano
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=7vtyfc7ymk.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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