git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits

From
Christian Couder <chriscool@tuxfamily.org>
Date
May 30, 2010, 06:41 UTC
Message-ID
<201005300841.15606.chriscool@tuxfamily.org>
In-Reply-To
<7vmxvi4tkq.fsf@alter.siamese.dyndns.org>
On Saturday 29 May 2010 17:27:01 Junio C Hamano wrote:
Show 38 quoted lines
> Christian Couder <chriscool@tuxfamily.org> writes:
> > This makes it possible to pass a range of commits like A..B
> > to "git cherry-pick" and to "git revert" to process many
> > commits instead of just one.
> >
> > @@ -545,6 +542,40 @@ static int revert_or_cherry_pick(int argc, const
> > char **argv) if (read_cache() < 0)
> >  		die("git %s: failed to read the index", me);
> >
> > +	dotdot = strstr(commit_name, "..");
> > +	if (dotdot) {
> > +		struct rev_info revs;
> > +		const char *argv[4];
> > +		int argc = 0;
> > +
> > +		argv[argc++] = NULL;
> > +		if (action != REVERT)
> > +			argv[argc++] = "--reverse";
> > +		argv[argc++] = commit_name;
> > +		argv[argc++] = NULL;
> > +
> > +		init_revisions(&revs, NULL);
> 
> The goal of the series is a worthy one, but I would imagine people would
> want to run these while on "maint":
> 
>     git cherry-pick master~2..master
>     git cherry-pick master^ master
> 
> or even
> 
>     git cherry-pick -2 master
> 
> How about enumerating the commits with an equivalent of
> 
>     git rev-list --no-walk "$@"
> 
> as an alternative implementation?

I agree that it would be nice, but I am not sure it would allow using "-2 master" as arguments because "--no-walk" seems to take over "-2":

$ git rev-list --no-walk -2 master 81fa024cd8e336ba257f13fe7724b95baacfa3ad $

Show 6 quoted lines
> The current behaviour would fall out just as a natural special case
> because
> 
>     git rev-list --no-walk $commit == $commit
> 
> Hmm?

Yes, I will provide an updated patch series using the equivalent of '--no-walk "$@"' but arguments like "-2 master" will not work.

Thanks, Christian.

 
Previous: Junio C HamanoNext: Johannes Schindelin
Message 9 of 15 in “implement "git cherry-pick A..B"”
  1. 0/4 implement "git cherry-pick A..B"Christian Couder, May 29, 2010
  2. 1/4 revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder, May 29, 2010
  3. 2/4 revert: refactor code into a do_pick_commit() functionChristian Couder, May 29, 2010
  4. Ramkumar RamachandraMay 30, 2010
  5. Jonathan NiederMay 30, 2010
  6. Christian CouderMay 30, 2010
  7. 3/4 revert: allow cherry-picking a range of commitsChristian Couder, May 29, 2010
  8. Junio C HamanoMay 29, 2010
  9. Christian CouderMay 30, 2010
  10. Johannes SchindelinMay 29, 2010
  11. Christian CouderMay 30, 2010
  12. Christian CouderJun 1, 2010
  13. 4/4 revert: add tests to check cherry-picking a range of commitsChristian Couder, May 29, 2010
  14. Sverre RabbelierMay 29, 2010
  15. Christian CouderMay 30, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.