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

Re: [RFC/PATCH 0/2] merge-base: add --merge-child option

From
John Keeping <john@keeping.me.uk>
Date
May 13, 2013, 07:52 UTC
Message-ID
<20130513075230.GO2299@serenity.lan>
In-Reply-To
<7vppwvqxow.fsf@alter.siamese.dyndns.org>
On Sun, May 12, 2013 at 10:02:39PM -0700, Junio C Hamano wrote:
Show 18 quoted lines
> Kevin Bracey <kevin@bracey.fi> writes:
> 
> > On 12/05/2013 19:58, John Keeping wrote:
> >>
> >> With the patch below, the --ancestry-path version drops to under 2
> >> seconds.
> >>
> >> I'm not sure if this is a good idea though.  It helps me say "I know
> >> nothing that isn't on the ancestry path can be patch-identical, so don't
> >> bother checking if it is" but it regresses users who want the full
> >> cherry-pick check while only limiting the output.
> >
> > Hmm. Should an excluded commit be a valid comparator? Is it
> > sensible/correct to show a left commit as "=" to a right commit that
> > has been excluded by the revision specifiers? Doesn't sound right to
> > me.
> 
> Neither to me.

OK. I'll add some tests and send a proper patch once 1.8.3 is out of the way.

Previous: Junio C Hamano
Message 22 of 22 in “merge-base: add --merge-child option”
  1. 0/2 merge-base: add --merge-child optionJohn Keeping, May 11, 2013
  2. 1/2 commit: add commit_list_contains functionJohn Keeping, May 11, 2013
  3. 2/2 merge-base: add --merge-child optionJohn Keeping, May 11, 2013
  4. Junio C HamanoMay 11, 2013
  5. John KeepingMay 11, 2013
  6. Kevin BraceyMay 12, 2013
  7. John KeepingMay 12, 2013
  8. John KeepingMay 12, 2013
  9. Kevin BraceyMay 12, 2013
  10. Junio C HamanoMay 12, 2013
  11. Kevin BraceyMay 13, 2013
  12. Michael J GruberMay 13, 2013
  13. log --cherry and merges (was [RFC/PATCH 0/2] merge-base: add --merge-child option)John Keeping, May 19, 2013
  14. Jonathan NiederMay 20, 2013
  15. 0/2 Make --ancestry-path A...B workKevin Bracey, May 13, 2013
  16. 1/2 t6019: demonstrate --ancestry-path A...B breakageKevin Bracey, May 13, 2013
  17. 2/2 revision.c: treat A...B merge bases as if manually specifiedKevin Bracey, May 13, 2013
  18. Junio C HamanoMay 13, 2013
  19. John KeepingMay 12, 2013
  20. Kevin BraceyMay 12, 2013
  21. Junio C HamanoMay 13, 2013
  22. John KeepingMay 13, 2013

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.