Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> 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.
--
To unsubscribe from this list: 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