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

Re: [PATCH v4 7/8] worktree: add relative cli/config options to `repair` command

From
Pphillip.wood123@gmail.com <phillip.wood123@gmail.com>
Date
Nov 24, 2024, 19:27 UTC
Message-ID
<60325a17-82e3-4a4c-a6fd-d3b597f1c2bc@gmail.com>
In-Reply-To
<D5TBGJS8FWBE.3QYEZWZUS0C71@pm.me>
Hi Caleb
On 23/11/2024 05:41, Caleb White wrote:
Show 12 quoted lines
> On Fri Nov 22, 2024 at 9:55 AM CST, Phillip Wood wrote:
>> On 01/11/2024 04:38, Caleb White wrote:
>> We used to update only the ".git", now we'll update both. In the case
>> where we're changing to/from absolute/relative paths that's good because
>> we'll update the "gitdir" file as well. In the other cases it looks like
>> we've we've found this worktree via the "gitdir" file so it should be
>> safe to write the same value back to that file.
> 
> Yes, there is an edge case that a file is written with the same (correct)
> contents, but I think this is acceptable given that it would be more
> complicated to check if the contents are the same before writing (which
> would involve reading the file).

That's fine - it might be worth explaining it in the commit message though (the same goes for the other patches where we start writing both files instead of one).

Show 15 quoted lines
>>>    	strbuf_addf(&dotgit, "%s/.git", path);
>>> -	if (!strbuf_realpath(&realdotgit, dotgit.buf, 0)) {
>>> +	if (!strbuf_realpath(&dotgit, dotgit.buf, 0)) {
>>
>> This works because strbuf_realpath() copies dotgit.buf before it resets
>> dotgit but that does not seem to be documented and looking at the output of
>>
>>       git grep strbuf_realpath | grep \\.buf
>>
>> I don't see any other callers relying on this outside of your earlier
>> changes to this file. Given that I wonder if we should leave it as is
>> which would also simplify this patch as the interesting changes are
>> swamped by the strbuf tweaking.
> 
> I'd like to keep this if that's okay.

Let's leave it as is and see what Junio thinks - my worry is that if strbuf_realpath() gets refactored in the future it could break this code.

Show 5 quoted lines
> All of the strbuf tweaking was
> so that way there is a consistency the variable names across the
> implementations---all the calls to `write_worktree_linking_files()` use
> `dotgit` and `gitdir` as the strubuf names so it should be easier to
> follow now.
Yes the end state is nice, I just found it a bit confusing getting there.
Best Wishes
Phillip
> Best,
> 
> Caleb
> 
Previous: Caleb WhiteNext: Caleb White
Message 25 of 60 in “Allow relative worktree linking to be configured by the user”
  1. 0/8 Allow relative worktree linking to be configured by the userCaleb White, Nov 1, 2024
  2. 1/8 setup: correctly reinitialize repository versionCaleb White, Nov 1, 2024
  3. 2/8 worktree: add `relativeWorktrees` extensionCaleb White, Nov 1, 2024
  4. Phillip WoodNov 19, 2024
  5. Caleb WhiteNov 20, 2024
  6. Phillip WoodNov 22, 2024
  7. Caleb WhiteNov 22, 2024
  8. 3/8 worktree: refactor infer_backlink returnCaleb White, Nov 1, 2024
  9. Phillip WoodNov 19, 2024
  10. Caleb WhiteNov 20, 2024
  11. Phillip WoodNov 22, 2024
  12. Caleb WhiteNov 22, 2024
  13. 4/8 worktree: add `write_worktree_linking_files()` functionCaleb White, Nov 1, 2024
  14. 6/8 worktree: add relative cli/config options to `move` commandCaleb White, Nov 1, 2024
  15. Phillip WoodNov 22, 2024
  16. Caleb WhiteNov 23, 2024
  17. 5/8 worktree: add relative cli/config options to `add` commandCaleb White, Nov 1, 2024
  18. Phillip WoodNov 19, 2024
  19. Caleb WhiteNov 20, 2024
  20. phillip.wood123@gmail.comNov 22, 2024
  21. Caleb WhiteNov 23, 2024
  22. 7/8 worktree: add relative cli/config options to `repair` commandCaleb White, Nov 1, 2024
  23. Phillip WoodNov 22, 2024
  24. Caleb WhiteNov 23, 2024
  25. phillip.wood123@gmail.comNov 24, 2024
  26. Caleb WhiteNov 26, 2024
  27. 8/8 worktree: refactor `repair_worktree_after_gitdir_move()`Caleb White, Nov 1, 2024
  28. Phillip WoodNov 22, 2024
  29. Caleb WhiteNov 23, 2024
  30. Junio C HamanoNov 1, 2024
  31. Caleb WhiteNov 1, 2024
  32. Junio C HamanoNov 2, 2024
  33. Kristoffer HaugsbakkNov 2, 2024
  34. Phillip WoodNov 22, 2024
  35. Caleb WhiteNov 23, 2024
  36. 0/8 Allow relative worktree linking to be configured by the userCaleb White, Nov 26, 2024
  37. 1/8 setup: correctly reinitialize repository versionCaleb White, Nov 26, 2024
  38. 2/8 worktree: add `relativeWorktrees` extensionCaleb White, Nov 26, 2024
  39. 3/8 worktree: refactor infer_backlink returnCaleb White, Nov 26, 2024
  40. 4/8 worktree: add `write_worktree_linking_files()` functionCaleb White, Nov 26, 2024
  41. 5/8 worktree: add relative cli/config options to `add` commandCaleb White, Nov 26, 2024
  42. 6/8 worktree: add relative cli/config options to `move` commandCaleb White, Nov 26, 2024
  43. 7/8 worktree: add relative cli/config options to `repair` commandCaleb White, Nov 26, 2024
  44. 8/8 worktree: refactor `repair_worktree_after_gitdir_move()`Caleb White, Nov 26, 2024
  45. Junio C HamanoNov 26, 2024
  46. Caleb WhiteNov 26, 2024
  47. Phillip WoodNov 28, 2024
  48. Caleb WhiteNov 28, 2024
  49. 0/8 Allow relative worktree linking to be configured by the userCaleb White, Nov 29, 2024
  50. 1/8 setup: correctly reinitialize repository versionCaleb White, Nov 29, 2024
  51. 2/8 worktree: add `relativeWorktrees` extensionCaleb White, Nov 29, 2024
  52. 3/8 worktree: refactor infer_backlink returnCaleb White, Nov 29, 2024
  53. 4/8 worktree: add `write_worktree_linking_files()` functionCaleb White, Nov 29, 2024
  54. 5/8 worktree: add relative cli/config options to `add` commandCaleb White, Nov 29, 2024
  55. 6/8 worktree: add relative cli/config options to `move` commandCaleb White, Nov 29, 2024
  56. 7/8 worktree: add relative cli/config options to `repair` commandCaleb White, Nov 29, 2024
  57. 8/8 worktree: refactor `repair_worktree_after_gitdir_move()`Caleb White, Nov 29, 2024
  58. Phillip WoodDec 2, 2024
  59. Junio C HamanoDec 3, 2024
  60. Caleb WhiteDec 3, 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.