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

Re: [PATCH v2 2/4] ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Aug 13, 2014, 13:07 UTC
Message-ID
<vpq8umstu5c.fsf@anie.imag.fr>
In-Reply-To
<53EB5D58.7000300@gmail.com>
Tanay Abhra <tanayabh@gmail.com> writes:
Show 5 quoted lines
> There is one slight behavior change, previously "merge.default"
> silently ignored a NULL value and didn't raise any error. But,
> in the same function, all other values raise an error on a NULL
> value. So to conform with other call sites in Git, a NULL value
> for "merge.default" raises an error.
Good, thanks.
Show 6 quoted lines
> We cannot easily use the new config-set API here, because
> much of the function is dedicated to processing
> "merge.<name>.variable" which does not easily translate to
> the new API. If it were for variables like,
> "merge.summary", "merge.tool", and "merge.verbosity", we
> could use the new API.

I think this would deserve to be in the commit message, but I'm fine with keeping it here too.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Tanay AbhraNext: Junio C Hamano
Message 5 of 19 in “fast-import.c: replace `git_config()` with `git_config_get_*()` family”
  1. 1/4 fast-import.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra, Aug 13, 2014
  2. 2/4 ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra, Aug 13, 2014
  3. Matthieu MoyAug 13, 2014
  4. 2/4 ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra, Aug 13, 2014
  5. Matthieu MoyAug 13, 2014
  6. Junio C HamanoAug 13, 2014
  7. 3/4 merge-recursive.c: replace `git_config()` with `git_config_get_int()`Tanay Abhra, Aug 13, 2014
  8. Matthieu MoyAug 13, 2014
  9. 4/4 builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`Tanay Abhra, Aug 13, 2014
  10. Matthieu MoyAug 13, 2014
  11. Tanay AbhraAug 13, 2014
  12. 1/5 fast-import.c: replace `git_config()` with `git_config_get_*()` familyTanay Abhra, Aug 13, 2014
  13. Matthieu MoyAug 13, 2014
  14. 1/2 git_default_config() rewritten using the config-set APITanay Abhra, Aug 13, 2014
  15. 2/2 use the new git_default_config()Tanay Abhra, Aug 13, 2014
  16. Matthieu MoyAug 13, 2014
  17. Junio C HamanoAug 13, 2014
  18. Matthieu MoyAug 13, 2014
  19. Junio C HamanoAug 13, 2014

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.