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

Re: [PATCH v2 2/2] for-each-repo: work correctly in a worktree

From
Derrick Stolee <stolee@gmail.com>
Date
Mar 2, 2026, 15:31 UTC
Message-ID
<cd9adbd9-b996-46da-b6a8-d2395be79a0f@gmail.com>
In-Reply-To
<20260227224238.GA2956443@coredump.intra.peff.net>
On 2/27/2026 5:42 PM, Jeff King wrote:
Show 39 quoted lines
> On Thu, Feb 26, 2026 at 10:29:47AM -0500, Derrick Stolee wrote:
> 
>> Great point. Here's another attempt:
>>
>> static int run_command_on_repo(const char *path, int argc, const char ** argv)
>> {
>> 	int i = 0;
>> 	struct child_process child = CHILD_PROCESS_INIT;
>> 	char *abspath = interpolate_path(path, 0);
>>
>> 	while (local_repo_env[i]) {
>> 		/*
>> 		 * Preserve pre-builtin options:
>> 		 * - CONFIG_ENVIRONMENT, CONFIG_DATA_ENVIRONMENT, and
>> 		 *   CONFIG_COUNT_ENVIRONMENT persist -c <name>=<value>
>> 		 *   and --config-env=<name>=<envvar> options.
>> 		 * - NO_REPLACE_OBJECTS_ENVIRONMENT persists the
>> 		 *   --no-replace-objects option.
>> 		 *
>> 		 * Note that the following options are not in local_repo_env:
>> 		 * - EXEC_PATH_ENVIRONMENT persists --exec-path option.
>> 		 */
>> 		if (strncmp(local_repo_env[i], "CONFIG_", 7) &&
>> 		    strcmp(local_repo_env[i], NO_REPLACE_OBJECTS_ENVIRONMENT))
>> 			strvec_push(&child.env, local_repo_env[i]);
> 
> This is slightly different than what prepare_other_repo_env() does:
> 
>   - it doesn't drop GIT_CONFIG_*, but assumes that removing
>     GIT_CONFIG_COUNT is enough for GIT_CONFIG_KEY/VALUE to be ignored
>     (and then also removes GIT_CONFIG_PARAMETERS, of course)
> 
>   - it doesn't consider NO_REPLACE_OBJECTS at all
> 
> I think you could make arguments either way about what should happen
> when spawning a command in another repo. But I'd really prefer for us to
> have a single spot to specify that policy, and not subtly-different
> behavior from different commands. So I'd really like to see this using
> that other function (or the logic from it factored out into a helper).
I agree that it would be best to have a single place.

I was looking at prepare_other_repo_env() and saw that it requires a computed gitdir, which is not easy to compute. We want the child process to perform that discovery based on the -C parameter.

However, we can extract the existing environment clearing logic and use that here. I'll give that a try and confirm that it passes the tests that I prepared to fix the bugs in this version.

Show 6 quoted lines
> And then we can consider whether to make changes to that policy.
> 
> Dropping GIT_CONFIG_* from the environment does make sense in general,
> but it doesn't actually happen with the patch above (because only
> GIT_CONFIG_COUNT is in the local_repo_env list; to find the others we'd
> have to actually enumerate the current environment).

It has GIT_CONFIG (the local Git config file), GIT_CONFIG_COUNT, and GIT_CONFIG_PARAMETERS. My patch was wrong because of the string, showing the value in having tests to confirm the right behavior.

Show 16 quoted lines
> For NO_REPLACE_OBJECTS, I think you could argue that it should not be in
> local_repo_env at all. It is more about the operation being performed,
> not the repository itself. So for example in this command:
> 
>   git --no-replace-objects fetch
> 
> I would expect that NO_REPLACE_OBJECTS to make it down to any submodule
> fetches we do. Likewise for other operation-level variables like
> GIT_LITERAL_PATHSPECS, but those are already (correctly IMHO) omitted
> from local_repo_env.
> 
> It looks like NO_REPLACE_OBJECTS got pulled from the connect.c code in
> 48a7c1c49d (Refactor list of of repo-local env vars, 2010-02-25). And I
> could see somebody wanting to make sure that upload-pack behaved
> predictably with respect to replace refs, but it already does: it
> disables replace refs itself as part of its startup code.

OK. I won't special case this myself and will let this be changed independently, if that is indeed valuable.

Show 15 quoted lines
>> This comment details my findings from comparing the list in
>> local_repo_env[] and the top-level options listed in
>> Documentation/git.adoc. That's how I was able to find that
>> --exec-path sets an environment variable that's NOT in the
>> list and we want to be sure we don't set it.
>>
>> Should we add the comparison to EXEC_PATH_ENVIRONMENT as a
>> precaution to make sure it's not added to local_repo_env in
>> the future? Or is that too defensive?
> 
> I don't think we need to bother. Obviously adding it to local_repo_env
> would be the wrong thing, but that is true of lots of variables. Trying
> to make a list is just going to result in a list that is out-of-date,
> because there's nothing pushing people to update it when they introduce
> a new variable.
This is where I was landing, too.
Show 7 quoted lines
> You can imagine a different world, where we had a single list of all
> environment variables, and new ones _had_ to be added to the list in
> order to function, and each entry had a bitflag for "this is a
> local-repo value", then that might force each new addition to consider
> whether it should be added. But we don't have such a list, and I think
> structuring things that way would introduce new complications and
> awkwardness.

This makes sense. In the meantime, having a single place that unsets environment variables for certain child processes is good enough to cover what we need here.

Thanks, -Stolee

Previous: Jeff KingNext: Jeff King
Message 24 of 48 in “for-each-repo: work correctly in a worktree”
  1. 0/2 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Feb 24, 2026
  2. 1/2 for-each-repo: stop using the_repositoryDerrick Stolee via GitGitGadget, Feb 24, 2026
  3. Patrick SteinhardtFeb 24, 2026
  4. Derrick StoleeFeb 24, 2026
  5. 2/2 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Feb 24, 2026
  6. Eric SunshineFeb 24, 2026
  7. Jeff KingFeb 24, 2026
  8. Derrick StoleeFeb 24, 2026
  9. Jeff KingFeb 25, 2026
  10. Patrick SteinhardtFeb 24, 2026
  11. 0/2 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Feb 24, 2026
  12. 1/2 for-each-repo: test outside of repo contextDerrick Stolee via GitGitGadget, Feb 24, 2026
  13. 2/2 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Feb 24, 2026
  14. Junio C HamanoFeb 24, 2026
  15. Derrick StoleeFeb 25, 2026
  16. Jeff KingFeb 25, 2026
  17. Derrick StoleeFeb 26, 2026
  18. Junio C HamanoFeb 26, 2026
  19. Phillip WoodFeb 26, 2026
  20. Junio C HamanoFeb 27, 2026
  21. Derrick StoleeFeb 27, 2026
  22. Jeff KingFeb 27, 2026
  23. Jeff KingFeb 27, 2026
  24. Derrick StoleeMar 2, 2026
  25. Jeff KingMar 2, 2026
  26. 0/4 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Mar 2, 2026
  27. 1/4 for-each-repo: test outside of repo contextDerrick Stolee via GitGitGadget, Mar 2, 2026
  28. Jeff KingMar 2, 2026
  29. Junio C HamanoMar 2, 2026
  30. Derrick StoleeMar 2, 2026
  31. 2/4 run-command: extract clear_local_repo_env helperDerrick Stolee via GitGitGadget, Mar 2, 2026
  32. Jeff KingMar 2, 2026
  33. Junio C HamanoMar 2, 2026
  34. Derrick StoleeMar 2, 2026
  35. 3/4 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Mar 2, 2026
  36. Jeff KingMar 2, 2026
  37. Derrick StoleeMar 2, 2026
  38. Junio C HamanoMar 2, 2026
  39. 4/4 for-each-repo: simplify passing of parametersDerrick Stolee via GitGitGadget, Mar 2, 2026
  40. Jeff KingMar 2, 2026
  41. 0/4 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Mar 3, 2026
  42. 1/4 for-each-repo: test outside of repo contextDerrick Stolee via GitGitGadget, Mar 3, 2026
  43. 2/4 run-command: extract sanitize_repo_env helperDerrick Stolee via GitGitGadget, Mar 3, 2026
  44. 3/4 for-each-repo: work correctly in a worktreeDerrick Stolee via GitGitGadget, Mar 3, 2026
  45. 4/4 for-each-repo: simplify passing of parametersDerrick Stolee via GitGitGadget, Mar 3, 2026
  46. Jeff KingMar 5, 2026
  47. Patrick SteinhardtMar 5, 2026
  48. Derrick StoleeMar 5, 2026

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.