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

Re: [RFC/PATCH jn/merge-renormalize] merge-recursive: expose merge options for builtin merge

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 25, 2010, 04:29 UTC
Message-ID
<20100825042906.GI11619@burratino>
In-Reply-To
<7vk4nfvo56.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
Show 7 quoted lines
>> There are two very similar blocks of code that recognize options for
>> the "recursive" merge strategy.  Unify them.
>>
>> No functional change intended.
>
> It makes sense, but I wonder why you chose to do "if (fun() <= 0) error"
> instead of usual "if (fun() < 0) error"...

No good reason (an attempt to vaguely imitate the interface of handle_revision_opt() from revision.c). Since both callers die for an unrecognized option, returning 0 for success and -1 for failure would indeed be simpler.

I'll try to find time to reroll the series (including --patience) on top of jn/merge-renormalize tomorrow. Probably --ignore-space-change et al are safe, too, though some test cases would be nice.

Previous: Junio C HamanoNext: Justin Frankel
Message 5 of 23 in “git-merge: ignore space support”
  1. git-merge: ignore space supportJustin Frankel, Aug 23, 2010
  2. Jonathan NiederAug 24, 2010
  3. merge-recursive: expose merge options for builtin mergeJonathan Nieder, Aug 24, 2010
  4. Junio C HamanoAug 24, 2010
  5. Jonathan NiederAug 25, 2010
  6. Justin FrankelAug 24, 2010
  7. Jonathan NiederAug 25, 2010
  8. Bert WesargAug 25, 2010
  9. Justin FrankelAug 25, 2010
  10. Junio C HamanoAug 25, 2010
  11. Justin FrankelAug 25, 2010
  12. Junio C HamanoAug 24, 2010
  13. Bert WesargAug 24, 2010
  14. Jonathan NiederAug 25, 2010
  15. 0/4 git-merge: ignore space supportJonathan Nieder, Aug 26, 2010
  16. 1/4 merge-recursive: expose merge options for builtin mergeJonathan Nieder, Aug 26, 2010
  17. 2/4 ll-merge: replace flag argument with options structJonathan Nieder, Aug 26, 2010
  18. Junio C HamanoAug 26, 2010
  19. ll-merge: simplify opts == NULL caseJonathan Nieder, Jan 16, 2011
  20. 3/4 merge-recursive --patienceJonathan Nieder, Aug 26, 2010
  21. 4/4 merge-recursive: options to ignore whitespace changesJonathan Nieder, Aug 26, 2010
  22. Junio C HamanoAug 26, 2010
  23. Jonathan NiederAug 27, 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.