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

Re: [PATCH] branch: colorize branches checked out in a linked working tree the same way as the current branch is colorized

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Sep 27, 2018, 17:59 UTC
Message-ID
<87sh1uizxp.fsf@evledraar.gmail.com>
In-Reply-To
<CAC05387S9P+w8yqqcjkQDnURYSgQmqtukxS4KvqJu-kDA+_o0g@mail.gmail.com>
On Thu, Sep 27 2018, Nickolai Belakovski wrote:
Show 13 quoted lines
> Will do re: screenshot when I get home, although it's pretty easy to
> imagine, the git branch output will have one other branch colored in green,
> bit without the asterisk (for one linked worktree) :)
>
> Also will do re: changing comments to /**/ (didn't know // was from C++,
> TIL) and I'll clean up the comments to remove some of the more obvious
> ones, but I'll try to keep a comment explaining the basic flow of creating
> a nest if statement to evaluate worktree refs for color.
>
> And yes, I copy/pasted into gmail. I was having trouble setting up
> send-email, but I think I may have it figured out now. Should I create a
> new thread with send-email? Or maybe reply to this one (I can do that by
> specifying the Message-ID to reply to right?

You'd run git format-patch master..your-topic with --subject-prefix="PATCH v2" and --in-reply-to="<CAC05386q2iGoiJ_fRgwoOTF23exEN2D1+oh4VjajEvYQ58O1TQ@mail.gmail.com>". Then it'll show up in reply to your v1.

You can also for an easier experience do this via GitGitGadget, see https://github.com/gitgitgadget/gitgitgadget looking at its code it seems to have some way to reference a Message-ID, but I don't know how to trigger that.

> This is my first time using this workflow, so I appreciate your
> patience :) )?
No worries, happy to help.
Show 54 quoted lines
> On Thu, Sep 27, 2018 at 8:33 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> wrote:
>
>>
>> On Thu, Sep 27 2018, Nickolai Belakovski wrote:
>>
>> > In order to more clearly display which branches are active, the output
>> > of git branch is modified to colorize branches checked out in any linked
>> > worktrees with the same color as the current branch.
>> >
>> > This is meant to simplify workflows related to worktree, particularly
>> > due to the limitations of not being able to check out the same branch in
>> > two worktrees and the inability to delete a branch checked out in a
>> > worktree. When performing branch operations like checkout and delete, it
>> > would be useful to know more readily if the branches in which the user
>> > is interested are already checked out in a worktree.
>> >
>> > The git worktree list command contains the relevant information, however
>> > this is a much less frquently used command than git branch.
>> >
>> > Signed-off-by: Nickolai Belakovski <nbelakovski@gmail.com>
>>
>> Sounds cool, b.t.w. would be neat-o to have some screenshot uploaded to
>> imgur or whatever just to skim what it looks like before/after.
>>
>> > diff --git a/builtin/branch.c b/builtin/branch.c
>> > index 4fc55c350..65b58ff7c 100644
>> > --- a/builtin/branch.c
>> > +++ b/builtin/branch.c
>> > @@ -334,11 +334,36 @@ static char *build_format(struct ref_filter
>> > *filter, int maxwidth, const char *r
>> >         struct strbuf local = STRBUF_INIT;
>> >         struct strbuf remote = STRBUF_INIT;
>> >
>> > -       strbuf_addf(&local, "%%(if)%%(HEAD)%%(then)* %s%%(else)
>> %s%%(end)",
>> > -                   branch_get_color(BRANCH_COLOR_CURRENT),
>> > -                   branch_get_color(BRANCH_COLOR_LOCAL));
>> > -       strbuf_addf(&remote, "  %s",
>> > -                   branch_get_color(BRANCH_COLOR_REMOTE));
>> > +       // Prepend the current branch of this worktree with "* " and
>> > all other branches with "  "
>>
>>
>> We use /* ... */ C comments, not C++-style // (well, it's in C now, but
>> not the ancient versions we need to support).
>>
>> It also seems all of this patch was copy/pasted into GMail or something,
>> it has wrapping and doesn't apply with "git am".
>>
>> Also most/all of these comments I'd say we could better do without,
>> i.e. the ones explaining basic code flow that's easy to see from the
>> code itself.
>>
Previous: Nickolai BelakovskiNext: Johannes Schindelin
Message 123 of 125 in “branch: colorize branches checked out in a linked working tree the same way as the current branch is colorized”
  1. branch: colorize branches checked out in a linked working tree the same way as the current branch is colorizedNickolai Belakovski, Sep 27, 2018
  2. Ævar Arnfjörð BjarmasonSep 27, 2018
  3. Nickolai BelakovskiSep 27, 2018
  4. Duy NguyenSep 27, 2018
  5. Jeff KingSep 27, 2018
  6. Nickolai BelakovskiSep 27, 2018
  7. Jeff KingSep 27, 2018
  8. Rafael AscensãoSep 27, 2018
  9. Jeff KingSep 27, 2018
  10. Jeff KingSep 27, 2018
  11. Junio C HamanoSep 27, 2018
  12. Jeff KingSep 28, 2018
  13. Junio C HamanoSep 28, 2018
  14. Rafael AscensãoSep 27, 2018
  15. Jeff KingSep 28, 2018
  16. Ævar Arnfjörð BjarmasonSep 27, 2018
  17. Nickolai BelakovskiSep 27, 2018
  18. Rafael AscensãoSep 27, 2018
  19. 0/2 refactoring branch colorization to ref-filternbelakovski@gmail.com, Nov 11, 2018
  20. 1/2 ref-filter: add worktree atomnbelakovski@gmail.com, Nov 11, 2018
  21. Junio C HamanoNov 12, 2018
  22. Jeff KingNov 12, 2018
  23. Junio C HamanoNov 13, 2018
  24. Nickolai BelakovskiNov 21, 2018
  25. Jeff KingNov 21, 2018
  26. Jeff KingNov 12, 2018
  27. 2/2 branch: Mark and colorize a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Nov 11, 2018
  28. Junio C HamanoNov 12, 2018
  29. Jeff KingNov 12, 2018
  30. Rafael AscensãoNov 12, 2018
  31. Junio C HamanoNov 13, 2018
  32. Jeff KingNov 13, 2018
  33. Nickolai BelakovskiNov 21, 2018
  34. 0/3 nbelakovski@gmail.com, Dec 16, 2018
  35. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Dec 16, 2018
  36. Jeff KingDec 18, 2018
  37. Nickolai BelakovskiDec 20, 2018
  38. Jeff KingDec 20, 2018
  39. 0/3 nbelakovski@gmail.com, Dec 24, 2018
  40. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Dec 24, 2018
  41. Jeff KingJan 3, 2019
  42. Eric SunshineJan 3, 2019
  43. 2/3 branch: Mark and color a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Dec 24, 2018
  44. 3/3 branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktreenbelakovski@gmail.com, Dec 24, 2018
  45. Jeff KingJan 3, 2019
  46. Jeff KingJan 3, 2019
  47. 2/3 branch: Mark and color a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Dec 16, 2018
  48. 3/3 branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktreenbelakovski@gmail.com, Dec 16, 2018
  49. Jeff KingDec 18, 2018
  50. 0/3 nbelakovski@gmail.com, Jan 6, 2019
  51. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Jan 6, 2019
  52. Junio C HamanoJan 7, 2019
  53. Nickolai BelakovskiJan 18, 2019
  54. Nickolai BelakovskiJan 18, 2019
  55. 2/3 branch: Mark and color a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Jan 6, 2019
  56. Junio C HamanoJan 7, 2019
  57. Philip OakleyJan 10, 2019
  58. Nickolai BelakovskiJan 13, 2019
  59. Junio C HamanoJan 14, 2019
  60. Nickolai BelakovskiJan 18, 2019
  61. 3/3 branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktreenbelakovski@gmail.com, Jan 6, 2019
  62. Junio C HamanoJan 7, 2019
  63. 0/3 nbelakovski@gmail.com, Jan 22, 2019
  64. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Jan 22, 2019
  65. Junio C HamanoJan 23, 2019
  66. Nickolai BelakovskiJan 23, 2019
  67. Junio C HamanoJan 24, 2019
  68. Jeff KingJan 24, 2019
  69. Junio C HamanoJan 24, 2019
  70. Jeff KingJan 24, 2019
  71. Junio C HamanoJan 24, 2019
  72. Jeff KingJan 24, 2019
  73. Nickolai BelakovskiJan 31, 2019
  74. Jeff KingJan 31, 2019
  75. Junio C HamanoJan 31, 2019
  76. Jeff KingJan 31, 2019
  77. 2/3 branch: Mark and color a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Jan 22, 2019
  78. 3/3 branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktreenbelakovski@gmail.com, Jan 22, 2019
  79. 0/3 nbelakovski@gmail.com, Feb 1, 2019
  80. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Feb 1, 2019
  81. Eric SunshineFeb 1, 2019
  82. Nickolai BelakovskiFeb 1, 2019
  83. Junio C HamanoFeb 4, 2019
  84. Nickolai BelakovskiFeb 18, 2019
  85. Junio C HamanoFeb 1, 2019
  86. 2/3 branch: Mark and color a branch differently if it is checked out in a linked worktreenbelakovski@gmail.com, Feb 1, 2019
  87. Junio C HamanoFeb 1, 2019
  88. Nickolai BelakovskiFeb 1, 2019
  89. Junio C HamanoFeb 4, 2019
  90. 3/3 branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktreenbelakovski@gmail.com, Feb 1, 2019
  91. Eric SunshineFeb 1, 2019
  92. Nickolai BelakovskiFeb 1, 2019
  93. Junio C HamanoFeb 1, 2019
  94. Nickolai BelakovskiFeb 1, 2019
  95. [RFC] Sample of test for git branch -vvnbelakovski@gmail.com, Feb 2, 2019
  96. Junio C HamanoFeb 1, 2019
  97. Nickolai BelakovskiFeb 1, 2019
  98. 0/3 nbelakovski@gmail.com, Feb 19, 2019
  99. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Feb 19, 2019
  100. 2/3 branch: update output to include worktree infonbelakovski@gmail.com, Feb 19, 2019
  101. Jeff KingFeb 21, 2019
  102. Nickolai BelakovskiMar 14, 2019
  103. 3/3 branch: add worktree info on verbose outputnbelakovski@gmail.com, Feb 19, 2019
  104. Jeff KingFeb 21, 2019
  105. Nickolai BelakovskiMar 14, 2019
  106. Junio C HamanoMar 18, 2019
  107. Jeff KingFeb 21, 2019
  108. Nickolai BelakovskiMar 14, 2019
  109. 0/3 nbelakovski@gmail.com, Mar 16, 2019
  110. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Mar 16, 2019
  111. 2/3 branch: update output to include worktree infonbelakovski@gmail.com, Mar 16, 2019
  112. 3/3 branch: add worktree info on verbose outputnbelakovski@gmail.com, Mar 16, 2019
  113. SZEDER GáborMar 18, 2019
  114. Junio C HamanoMar 18, 2019
  115. 0/3 nbelakovski@gmail.com, Apr 29, 2019
  116. 1/3 ref-filter: add worktreepath atomnbelakovski@gmail.com, Apr 29, 2019
  117. 2/3 branch: update output to include worktree infonbelakovski@gmail.com, Apr 29, 2019
  118. 3/3 branch: add worktree info on verbose outputnbelakovski@gmail.com, Apr 29, 2019
  119. SZEDER GáborApr 29, 2019
  120. Nickolai BelakovskiApr 29, 2019
  121. Johannes SchindelinApr 29, 2019
  122. Nickolai BelakovskiApr 29, 2019
  123. Ævar Arnfjörð BjarmasonSep 27, 2018
  124. Johannes SchindelinOct 2, 2018
  125. Johannes SchindelinApr 30, 2019

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.