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

Re: [PATCH v6 3/3] git-gui: handle GIT_DIR and GIT_WORK_TREE early

From
ABAina Boot <bootaina702@gmail.com>
Date
May 9, 2026, 08:46 UTC
Message-ID
<20260509084846.1694-1-bootaina702@gmail.com>
In-Reply-To
<54d3c28a-040e-470c-b061-8d3a1cfe4257@gmail.com>

After observing, I’d like to propose a clearer way to manage GIT_WORK_TREE and GIT_DIR environment variables.

Five procedures in total:
1. set_worktree_env – sets GIT_WORK_TREE in the environment only if
$_gitworktree is non-empty.
2. unset_worktree_env – safely unsets GIT_WORK_TREE (ignores if it’s
not set).
3. clear_git_env – unsets both GIT_DIR and GIT_WORK_TREE before
entering a submodule context.
4. capture_git_env – captures the current GIT_DIR and GIT_WORK_TREE
values for later restoration.
5. restore_git_env – restores the saved values, setting GIT_WORK_TREE
only if it was previously non-empty.

These would replace scattered, unguarded set/unset env(GIT_WORK_TREE) calls and ensure we don’t leave GIT_WORK_TREE defined when there is no actual worktree. It also makes the intention more explicit and reduces repetitive error-catching logic.

Aina
Previous: Mark LevedahlNext: Shroom Moo
Message 28 of 134 in “git-gui: handle bare repo or missing worktree”
  1. git-gui: handle bare repo or missing worktreeShroom Moo, Apr 21, 2026
  2. Johannes SixtApr 29, 2026
  3. 1/1 git-gui: protect rev-parse --show-toplevel callShroom Moo, Apr 29, 2026
  4. Shroom MooApr 29, 2026
  5. Mark LevedahlApr 29, 2026
  6. 1/1 git-gui: handle missing worktree and separated gitdirShroom Moo, Apr 30, 2026
  7. Mark LevedahlApr 30, 2026
  8. Shroom MooMay 1, 2026
  9. 1/1 git-gui: handle missing worktree and separated gitdirShroom Moo, May 1, 2026
  10. Johannes SixtMay 1, 2026
  11. Mark LevedahlMay 1, 2026
  12. Mark LevedahlMay 2, 2026
  13. Johannes SixtMay 3, 2026
  14. 1/1 git-gui: restructure repository startupShroom Moo, May 4, 2026
  15. Mark LevedahlMay 4, 2026
  16. Mark LevedahlMay 5, 2026
  17. Johannes SixtMay 6, 2026
  18. Johannes SixtMay 6, 2026
  19. Mark LevedahlMay 6, 2026
  20. Johannes SixtMay 6, 2026
  21. Mark LevedahlMay 6, 2026
  22. 0/3 git-gui: robustify startup and fix environment handlingShroom Moo, May 6, 2026
  23. 2/3 git-gui: disable gitk visualization when no worktree availableShroom Moo, May 6, 2026
  24. 1/3 git-gui: restructure repository startupShroom Moo, May 6, 2026
  25. 3/3 git-gui: handle GIT_DIR and GIT_WORK_TREE earlyShroom Moo, May 6, 2026
  26. Mark LevedahlMay 7, 2026
  27. Mark LevedahlMay 7, 2026
  28. Aina BootMay 9, 2026
  29. Shroom MooMay 9, 2026
  30. 0/3 git-gui: robustify startup and fix environment handlingShroom Moo, May 9, 2026
  31. 1/3 git-gui: restructure repository startupShroom Moo, May 9, 2026
  32. 3/3 git-gui: handle GIT_DIR and GIT_WORK_TREE earlyShroom Moo, May 9, 2026
  33. 2/3 git-gui: disable gitk visualization when no worktree availableShroom Moo, May 9, 2026
  34. Mark LevedahlMay 14, 2026
  35. 00/11 Improve git gui operation without a worktreeMark Levedahl, May 14, 2026
  36. 01/11 git-gui: allow specifying path '.' to the browserMark Levedahl, May 14, 2026
  37. 02/11 git-gui: refactor browser / blame argument parsingMark Levedahl, May 14, 2026
  38. 04/11 git-gui: put choose_repository::pick in a procMark Levedahl, May 14, 2026
  39. 05/11 git-gui: use --absolute-git-dirMark Levedahl, May 14, 2026
  40. 03/11 git-gui: guard set/unset of GIT_DIR and GIT_WORK_TREEMark Levedahl, May 14, 2026
  41. 06/11 git gui: GIT_DIR / GIT_WORK_TREE make any discovery error fatalMark Levedahl, May 14, 2026
  42. 07/11 git-gui: use rev-parse exclusively to find a repositoryMark Levedahl, May 14, 2026
  43. 08/11 git-gui: simplify [is_bare] to report if a worktree is knownMark Levedahl, May 14, 2026
  44. 09/11 git-gui: support using repository parent dir as a worktreeMark Levedahl, May 14, 2026
  45. 10/11 git-gui: improve worktree discoveryMark Levedahl, May 14, 2026
  46. 11/11 git-gui: add gui and pick as explicit subcommandsMark Levedahl, May 14, 2026
  47. Johannes SixtMay 15, 2026
  48. Johannes SixtMay 15, 2026
  49. Johannes SixtMay 15, 2026
  50. Aina BootMay 15, 2026
  51. Mark LevedahlMay 15, 2026
  52. Johannes SixtMay 15, 2026
  53. Johannes SixtMay 15, 2026
  54. Johannes SixtMay 15, 2026
  55. Johannes SixtMay 15, 2026
  56. Johannes SixtMay 15, 2026
  57. Johannes SixtMay 15, 2026
  58. Johannes SixtMay 16, 2026
  59. Johannes SixtMay 16, 2026
  60. Johannes SixtMay 16, 2026
  61. Johannes SixtMay 16, 2026
  62. Johannes SixtMay 16, 2026
  63. Mark LevedahlMay 16, 2026
  64. Mark LevedahlMay 16, 2026
  65. Mark LevedahlMay 16, 2026
  66. Mark LevedahlMay 16, 2026
  67. Mark LevedahlMay 16, 2026
  68. Mark LevedahlMay 16, 2026
  69. Mark LevedahlMay 16, 2026
  70. Mark LevedahlMay 16, 2026
  71. Mark LevedahlMay 16, 2026
  72. Johannes SixtMay 19, 2026
  73. Johannes SixtMay 19, 2026
  74. Mark LevedahlMay 19, 2026
  75. Mark LevedahlMay 19, 2026
  76. Johannes SixtMay 19, 2026
  77. 00/11 Improve git gui operation without a worktreeMark Levedahl, May 20, 2026
  78. 01/11 git-gui: guard set/unset of GIT_DIR and GIT_WORK_TREEMark Levedahl, May 20, 2026
  79. 02/11 git-gui: return status from choose_repository::pickMark Levedahl, May 20, 2026
  80. 04/11 git-gui: use rev-parse exclusively to find a repositoryMark Levedahl, May 20, 2026
  81. 05/11 git-gui: simplify [is_bare] to report if a worktree is knownMark Levedahl, May 20, 2026
  82. 06/11 git-gui: use git rev-parse for worktree discoveryMark Levedahl, May 20, 2026
  83. 07/11 git-gui: try harder to find worktree from gitdirMark Levedahl, May 20, 2026
  84. 03/11 git-gui: use --absolute-git-dirMark Levedahl, May 20, 2026
  85. 08/11 git-gui: use HEAD as current branch when detached (bug fix)Mark Levedahl, May 20, 2026
  86. 09/11 git-gui: allow specifying path '.' to the browserMark Levedahl, May 20, 2026
  87. 10/11 git-gui: adapt blame/browser parsing for bare operationMark Levedahl, May 20, 2026
  88. 11/11 git-gui: add gui and pick as explicit subcommandsMark Levedahl, May 20, 2026
  89. Shroom MooMay 21, 2026
  90. Shroom MooMay 21, 2026
  91. Mark LevedahlMay 21, 2026
  92. Mark LevedahlMay 21, 2026
  93. Johannes SixtMay 22, 2026
  94. Johannes SixtMay 22, 2026
  95. Johannes SixtMay 22, 2026
  96. Johannes SixtMay 22, 2026
  97. Mark LevedahlMay 22, 2026
  98. Mark LevedahlMay 22, 2026
  99. Shroom MooMay 22, 2026
  100. Shroom MooMay 22, 2026
  101. Mark LevedahlMay 22, 2026
  102. Mark LevedahlMay 22, 2026
  103. Johannes SixtMay 23, 2026
  104. Johannes SixtMay 23, 2026
  105. Aina BootMay 23, 2026
  106. Shroom MooMay 23, 2026
  107. Johannes SixtMay 23, 2026
  108. Johannes SixtMay 23, 2026
  109. Johannes SixtMay 23, 2026
  110. Johannes SixtMay 23, 2026
  111. Mark LevedahlMay 23, 2026
  112. Mark LevedahlMay 23, 2026
  113. Mark LevedahlMay 23, 2026
  114. fixup git-gui: allow blame to show uncommitted changesMark Levedahl, May 23, 2026
  115. Johannes SixtMay 23, 2026
  116. Johannes SixtMay 24, 2026
  117. Johannes SixtMay 24, 2026
  118. Mark LevedahlMay 25, 2026
  119. 00/12 Improve git gui operation without a worktreeMark Levedahl, May 31, 2026
  120. 01/12 git-gui: use HEAD as current branch when detachedMark Levedahl, May 31, 2026
  121. 02/12 git-gui: remove unnecessary 'cd $_gitworktree' from do_gitkMark Levedahl, May 31, 2026
  122. 03/12 git-gui: guard set/unset of GIT_DIR and GIT_WORK_TREEMark Levedahl, May 31, 2026
  123. 04/12 git-gui: do not change global vars in choose_repository::pickMark Levedahl, May 31, 2026
  124. 05/12 git-gui: use --absolute-git-dirMark Levedahl, May 31, 2026
  125. 06/12 git-gui: use rev-parse exclusively to find a repositoryMark Levedahl, May 31, 2026
  126. 07/12 git-gui: use git rev-parse for worktree discoveryMark Levedahl, May 31, 2026
  127. 08/12 git-gui: simplify [is_bare] to report if a worktree is knownMark Levedahl, May 31, 2026
  128. 09/12 git-gui: try harder to find worktree from gitdirMark Levedahl, May 31, 2026
  129. 10/12 git-gui: allow specifying path '.' to the browserMark Levedahl, May 31, 2026
  130. 11/12 git-gui: check browser/blame arguments carefullyMark Levedahl, May 31, 2026
  131. 12/12 git-gui: add gui and pick as explicit subcommandsMark Levedahl, May 31, 2026
  132. Johannes SixtJun 2, 2026
  133. Mark LevedahlJun 2, 2026
  134. Johannes SixtJun 2, 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.