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
Jun 1, 2010, 03:12 UTC
Message-ID
<201006010512.49804.chriscool@tuxfamily.org>
In-Reply-To
<201005300845.52141.chriscool@tuxfamily.org>
On Sunday 30 May 2010 08:45:52 Christian Couder wrote:
> On Saturday 29 May 2010 17:47:10 Johannes Schindelin wrote:
Hi Dscho,
Show 28 quoted lines
> Hi Dscho,
> 
> > Hi,
> >
> > On Sat, 29 May 2010, Christian Couder wrote:
> > > diff --git a/builtin/revert.c b/builtin/revert.c
> > > index 70372dc..c281a80 100644
> > > --- a/builtin/revert.c
> > > +++ b/builtin/revert.c
> > > @@ -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;
> >
> > Maybe "--no-merges"?
> 
> I will have a look at it. Thanks!

I decided against using it as it would be incompatible with the -m option to revert or cherry-pick a merge.

Thanks, Christian.

Previous: Christian CouderNext: Christian Couder
Message 12 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.