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

Re: [PATCH 0/2] worktree_git_path(): remove repository argument

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Feb 17, 2026, 15:22 UTC
Message-ID
<d7fe45b3-4a75-4a28-aa0e-74619fbe6a2f@gmail.com>
In-Reply-To
<20260217101242.14688-1-shreyanshpaliwalcmsmn@gmail.com>
On 17/02/2026 10:12, Shreyansh Paliwal wrote:
Show 23 quoted lines
>> On 14/02/2026 14:30, Phillip Wood wrote:
>>>
>>> I think that we should add a new function
>>>
>>> struct worktree *get_current_worktree(struct repository*);
>>>
>>> to worktree.c that constructs a struct worktree using repo->gitdir etc.
>>> The worktree id is the last path component of repo->gitdir when the
>>> repo->gitdir and repo->commondir differ, otherwise it is NULL. Then we
>>> can use that function to get the current worktree rather than passing
>>> NULL when we call wt_status_check_{rebase,bisect} from
>>> wt_status_get_state().
>>
>> Here's what that looks like, the first patch adds
>> get_worktree_from_repository() and uses it to avoid passing a NULL
>> worktree to worktree_git_path(). The second patch then removes the
>> repository argument from that function and always uses wt->repo instead.
>>
>> Shreyansh - I think your patches to clean up wt-status.c can probably proceed
>> separately to these if you remove the changes to
>> wt_status_check_{bisect,rebase}().
> 
> Cool. I'll send a revised version on the original thread.

Great, I hope I'm not stepping on your toes posting these patches. By the time I'd worked out what was needed and checked all the callers were passing a non-NULL worktree argument I had the code changes and commit messages so I thought I'd post them.

Thanks
Phillip
Previous: Shreyansh PaliwalNext: Shreyansh Paliwal
Message 28 of 39 in “worktree: change representation and usage of primary worktree”
  1. Shreyansh PaliwalFeb 13, 2026
  2. [RFC][PATCH 1/2] worktree: represent the primary worktree with '/' instead of NULLShreyansh Paliwal, Feb 13, 2026
  3. Junio C HamanoFeb 13, 2026
  4. Shreyansh PaliwalFeb 14, 2026
  5. [RFC][PATCH 2/2] worktree: stop passing NULL as primary worktreeShreyansh Paliwal, Feb 13, 2026
  6. Junio C HamanoFeb 13, 2026
  7. Shreyansh PaliwalFeb 14, 2026
  8. Phillip WoodFeb 14, 2026
  9. Junio C HamanoFeb 14, 2026
  10. Shreyansh PaliwalFeb 15, 2026
  11. Phillip WoodFeb 16, 2026
  12. Junio C HamanoFeb 17, 2026
  13. Shreyansh PaliwalFeb 17, 2026
  14. 0/2 worktree_git_path(): remove repository argumentPhillip Wood, Feb 16, 2026
  15. 1/2 wt-status: avoid passing NULL worktreePhillip Wood, Feb 16, 2026
  16. Phillip WoodFeb 17, 2026
  17. Shreyansh PaliwalFeb 17, 2026
  18. Phillip WoodFeb 17, 2026
  19. Shreyansh PaliwalFeb 17, 2026
  20. Junio C HamanoFeb 17, 2026
  21. Karthik NayakFeb 17, 2026
  22. Phillip WoodFeb 18, 2026
  23. Junio C HamanoFeb 17, 2026
  24. Phillip WoodFeb 18, 2026
  25. 2/2 path: remove repository argument from worktree_git_path()Phillip Wood, Feb 16, 2026
  26. Karthik NayakFeb 17, 2026
  27. Shreyansh PaliwalFeb 17, 2026
  28. Phillip WoodFeb 17, 2026
  29. Shreyansh PaliwalFeb 17, 2026
  30. 0/2 worktree_git_path(): remove repository argumentPhillip Wood, Feb 19, 2026
  31. 1/2 wt-status: avoid passing NULL worktreePhillip Wood, Feb 19, 2026
  32. Junio C HamanoFeb 19, 2026
  33. Junio C HamanoFeb 19, 2026
  34. Phillip WoodFeb 25, 2026
  35. Junio C HamanoFeb 25, 2026
  36. Phillip WoodFeb 26, 2026
  37. Junio C HamanoFeb 26, 2026
  38. 2/2 path: remove repository argument from worktree_git_path()Phillip Wood, Feb 19, 2026
  39. Junio C HamanoFeb 19, 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.