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

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

From
Stefan Beller <sbeller@google.com>
Date
Feb 5, 2016, 20:25 UTC
Message-ID
<CAGZ79kYfxYAZif4P0GRdy5LQVXuHAyr3VtwEtX7Uu0sDyD4yoQ@mail.gmail.com>
In-Reply-To
<20160205005946.GA19501@google.com>
On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
Show 22 quoted lines
> Hi,
>
> It's been a while since I looked at this series.  Hopefully I can
> come at it with some fresh eyes.  Thanks for your perseverance.
>
> Stefan Beller wrote:
>
>> We need the submodule update strategies in a later patch.
>
> This description doesn't explain what the patch will do or why
> parse_config didn't already retain the value.  If I look back
> at this patch later and want to understand why it was written,
> what would I want to know?
>
> It could say
>
>         Currently submodule.<name>.update is only handled by git-submodule.sh.
>         C code will start to need to make use of that value as more of the
>         functionality of git-submodule.sh moves into library code in C.
>
>         Add the update field to 'struct submodule' and populate it so it can
>         be read as sm->update.
ok
Show 33 quoted lines
>
> [...]
>> +++ b/submodule-config.c
>> @@ -311,6 +312,16 @@ static int parse_config(const char *var, const char *value, void *data)
>>                       free((void *) submodule->url);
>>                       submodule->url = xstrdup(value);
>>               }
>> +     } else if (!strcmp(item.buf, "update")) {
>> +             if (!value)
>> +                     ret = config_error_nonbool(var);
>> +             else if (!me->overwrite && submodule->update != NULL)
>> +                     warn_multiple_config(me->commit_sha1, submodule->name,
>> +                                          "update");
>> +             else {
>> +                     free((void *) submodule->update);
>> +                     submodule->update = xstrdup(value);
>> +             }
>
> (not about this patch) This code is repetitive.  Would there be a way
> to share code between the parsing of different per-submodule settings?
>
> [...]
>> --- a/submodule-config.h
>> +++ b/submodule-config.h
>> @@ -14,6 +14,7 @@ struct submodule {
>>       const char *url;
>>       int fetch_recurse;
>>       const char *ignore;
>> +     const char *update;
>
> gitmodules(5) tells me the only allowed values are checkout, rebase,
> merge, and none.  I wouldn't know at a glance how to match against
> those in calling code.  Can this be an enum?

"Note that the !command form is intentionally ignored here for security reasons."

However you can overwrite the update field in .git/config to be "! [foo]", which we also need to support, so let's keep it a string for now?

>
> Thanks,
> Jonathan
Previous: Jonathan NiederNext: Jonathan Nieder
Message 4 of 23 in “[PATCHv8 0/9] Expose submodule parallelism to the user”
  1. Stefan BellerFeb 4, 2016
  2. 1/9 submodule-config: keep update strategy aroundStefan Beller, Feb 4, 2016
  3. Jonathan NiederFeb 5, 2016
  4. Stefan BellerFeb 5, 2016
  5. Jonathan NiederFeb 5, 2016
  6. Stefan BellerFeb 5, 2016
  7. 2/9 submodule-config: drop check against NULLStefan Beller, Feb 4, 2016
  8. Jonathan NiederFeb 5, 2016
  9. 3/9 submodule-config: remove name_and_item_from_varStefan Beller, Feb 4, 2016
  10. Jonathan NiederFeb 6, 2016
  11. Stefan BellerFeb 6, 2016
  12. 4/9 submodule-config: slightly simplify lookup_or_create_by_nameStefan Beller, Feb 4, 2016
  13. Jonathan NiederFeb 6, 2016
  14. 5/9 submodule-config: introduce parse_generic_submodule_configStefan Beller, Feb 4, 2016
  15. Jonathan NiederFeb 6, 2016
  16. Stefan BellerFeb 6, 2016
  17. 6/9 fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller, Feb 4, 2016
  18. Junio C HamanoFeb 5, 2016
  19. Stefan BellerFeb 5, 2016
  20. Junio C HamanoFeb 5, 2016
  21. 7/9 git submodule update: have a dedicated helper for cloningStefan Beller, Feb 4, 2016
  22. 8/9 submodule update: expose parallelism to the userStefan Beller, Feb 4, 2016
  23. 9/9 clone: allow an explicit argument for parallel submodule clonesStefan Beller, Feb 4, 2016

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.