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

Re: [PATCH v2 10/11] git-gui: adapt blame/browser parsing for bare operation

From
Mark Levedahl <mlevedahl@gmail.com>
Date
May 21, 2026, 17:35 UTC
Message-ID
<bb38c5d4-b388-4eca-badd-69ec7ce67b90@gmail.com>
In-Reply-To
<tencent_407FE60B6954528497709B6CAD49018D120A@qq.com>
On 5/21/26 1:02 AM, Shroom Moo wrote:
Show 33 quoted lines
> On 5/21/26 4:24 AM, Mark Levedahl wrote: 
>> +proc find_path_type {head path} {
>> +	if {$path eq {./}} {
>> +		# the root-tree exists in every rev, ls-tree gives data on the contents,
>> +		# not the type of tree itself. So, if the rev exists, return {tree}
>> +		if {[catch {set objtype [git ls-tree $head]}]} {
>> +			set objtype {}
>> +		} else {
>> +			set objtype {tree}
>> +		}
>> +	} else {
>> +		# test that the path exists in head, ls-tree gives info on the path only
>> +		if {[catch {set objtype [git ls-tree {--format=%(objecttype)} $head $path]}]} {
>> +			set objtype {}
>> +		}
>> +	}
>> +	return $objtype
>> +}
> In v1, argument parsing relied on file exists within the worktree to 
> determine if a path existed, without using ls-tree. In v2, the use of 
> git ls-tree seems to actually be intended to list directory contents, 
> rather than querying the type of the path itself. 
>
> If $path is a directory (a tree object), git ls-tree outputs the 
> object type for every entry within that directory, one per line. 
>
> The variable objtype is assigned a multi-line string. When compared 
> against "tree", the match fails, causing the function to return an 
> empty string, which subsequently leads to an error. We can change to 
> "git cat-file -t" or similiar approaches. 
>
> Shroom
>

git ls-tree $rev $path --format='%(objecttype)' gives the type of the object at $path in $rev, or an error. The types returned are "tree" for a directory, "blob" for a file. So this gives definitive information if the object desired exists in the given rev, and is of the right type. (We don't care about commits and tags, those cannot be blamed or browsed).

git-lstree $rev $dirname/  lists all of the objects in the directory, while git-lstree $rev $dirname (no trailing /) gives info on the directory itself. There is no name for the root directory itself, all of its contents are listed. That is why the root './' is special case.

Asking the worktree that is on version 33 about whether frotz is a directory in version 2 is just asking for trouble, at best the worktree is authoritative for the checked out version, but even then there can be uncommitted changed. In the root of git-gui, I get

/git-gui.sh browser gitgui-0.9.0 Makefile 'Makefile' is not a directory in rev 'gitgui-0.9.0'

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