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

Re: [PATCH v6 3/4] notes: add notes.mergestrategy option to select default strategy

From
Jacob Keller <jacob.keller@gmail.com>
Date
Aug 14, 2015, 21:12 UTC
Message-ID
<CA+P7+xpPFO4cJbK=nZMMy8DYAB71xzq=gEaTB5D+_KACZLzaDw@mail.gmail.com>
In-Reply-To
<CAPig+cTjQu2LRuR5cC+VSihVB00k-bjew3eCqA4Ee_tRuDK_=w@mail.gmail.com>
On Fri, Aug 14, 2015 at 2:06 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 16 quoted lines
>     const char *value;
>
>     if (!git_config_get_string_const(key, &value)) {
>         if (parse_notes_strategy(value, strategy))
>             git_die_config(key, "unknown notes merge strategy '%s'", value);
>         return 0;
>     }
>     return 1;
>
> Or, the equivalent, but less indented:
>
>     if (git_config_get_string_const(key, &value))
>         return 1;
>     if (parse_notes_strategy(value, strategy))
>         git_die_config(key, "unknown notes merge strategy '%s'", value);
>     return 0;
I like it. Will do.
Previous: Eric SunshineNext: Jacob Keller
Message 6 of 7 in “notes.mergestrategy config option”
  1. 0/4 notes.mergestrategy config optionJacob Keller, Aug 14, 2015
  2. 1/4 notes: document cat_sort_uniq rewriteModeJacob Keller, Aug 14, 2015
  3. 2/4 notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller, Aug 14, 2015
  4. 3/4 notes: add notes.mergestrategy option to select default strategyJacob Keller, Aug 14, 2015
  5. Eric SunshineAug 14, 2015
  6. Jacob KellerAug 14, 2015
  7. 4/4 notes: teach git-notes about notes.<ref>.mergestrategy optionJacob Keller, Aug 14, 2015

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.