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

Re: [PATCH v2 1/5] worktree: add CLI/config options for relative path linking

From
Caleb White <cdwhite3@pm.me>
Date
Oct 30, 2024, 20:21 UTC
Message-ID
<D59F4X1I5COT.1QECM7J128ZIG@pm.me>
In-Reply-To
<ZyKUEbXedFuzY9Oz@nand.local>
On Wed Oct 30, 2024 at 3:16 PM CDT, Taylor Blau wrote:
Show 35 quoted lines
> On Wed, Oct 30, 2024 at 05:27:33AM +0000, Caleb White wrote:
>> >> diff --git a/builtin/worktree.c b/builtin/worktree.c
>> >> index dae63dedf4cac2621f51f95a39aa456b33acd894..c1130be5890c905c0b648782a834eb8dfcd79ba5 100644
>> >> --- a/builtin/worktree.c
>> >> +++ b/builtin/worktree.c
>> >> @@ -134,6 +134,9 @@ static int git_worktree_config(const char *var, const char *value,
>> >>   	if (!strcmp(var, "worktree.guessremote")) {
>> >>   		guess_remote = git_config_bool(var, value);
>> >>   		return 0;
>> >> +	} else if (!strcmp(var, "worktree.userelativepaths")) {
>> >> +		use_relative_paths = git_config_bool(var, value);
>> >
>> > As we're trying to remove global variables from libgit.a as part of the
>> > libification effort I'd be much happier if "use_relative_paths" was
>> > declared as a "static int" in this file and then passed down to the
>> > functions that need it rather than declaring it as a global in "worktree.c".
>>
>> I can create a getter/setter in the worktree API to handle this, but
>> I'd rather not pass it as an argument to every function that needs it as
>> that would be a lot of changes. All of these functions would need their
>> signatures updated to include the new parameter:
>>
>> - `add_worktree()`
>> - `update_worktree_location()`
>> - `repair_worktree_at_path()`
>> - `repair_worktrees()`
>> - `repair_worktree()`
>> - `write_worktree_linking_files()`
>
> There is no reason to have a "getter" and "setter" for a extern'd
> variable.
>
> I agree that it would be preferable to have use_relative_paths be a
> static int within this compilation unit and to pass it to the above
> functions.

If I created a getter/setter then the variable would no longer be extern'd.

To be clear, you're advocating that I change the function signature for all of the functions listed above to include the new parameter? That seems like a lot of parameter bloat when I could just set the variable in this compilation unit and access it directly in the `write_worktree_linking_files()` function.

Best, Caleb

Previous: Taylor BlauNext: phillip.wood123@gmail.com
Message 6 of 26 in “Allow relative worktree linking to be configured by the user”
  1. 0/5 Allow relative worktree linking to be configured by the userCaleb White, Oct 28, 2024
  2. 1/5 worktree: add CLI/config options for relative path linkingCaleb White, Oct 28, 2024
  3. Phillip WoodOct 29, 2024
  4. Caleb WhiteOct 30, 2024
  5. Taylor BlauOct 30, 2024
  6. Caleb WhiteOct 30, 2024
  7. phillip.wood123@gmail.comOct 30, 2024
  8. Caleb WhiteOct 30, 2024
  9. Taylor BlauOct 29, 2024
  10. Caleb WhiteOct 30, 2024
  11. 2/5 worktree: add `write_worktree_linking_files` functionCaleb White, Oct 28, 2024
  12. Phillip WoodOct 29, 2024
  13. Taylor BlauOct 29, 2024
  14. Caleb WhiteOct 30, 2024
  15. Caleb WhiteOct 30, 2024
  16. 3/5 worktree: add tests for worktrees with relative pathsCaleb White, Oct 28, 2024
  17. Phillip WoodOct 29, 2024
  18. Caleb WhiteOct 29, 2024
  19. phillip.wood123@gmail.comOct 29, 2024
  20. Caleb WhiteOct 30, 2024
  21. Taylor BlauOct 29, 2024
  22. Caleb WhiteOct 30, 2024
  23. 4/5 setup: correctly reinitialize repository versionCaleb White, Oct 28, 2024
  24. 5/5 worktree: add `relativeWorktrees` extensionCaleb White, Oct 28, 2024
  25. Phillip WoodOct 29, 2024
  26. Caleb WhiteOct 30, 2024

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.