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

Re: [PATCH v7] git-prompt: make colourization consistent

From
SZEDER Gábor <szeder.dev@gmail.com>
Date
Jun 11, 2022, 09:01 UTC
Message-ID
<20220611090131.GB1785@szeder.dev>
In-Reply-To
<xmqq5yl9lmgq.fsf@gitster.g>
On Thu, Jun 09, 2022 at 11:29:25AM -0700, Junio C Hamano wrote:
Show 27 quoted lines
> Joakim Petersen <joak-pet@online.no> writes:
> 
> > On 09/06/2022 11:03, SZEDER Gábor wrote:
> >> This patch seems to break colorization when __git_ps1() is invoked
> >> from $PROMPT_COMMAND:
> >>    ~/src/git (master)$ echo $PROMPT_COMMAND
> >> __git_ps1 "\[\e]0;\w - Terminal\a\e[01;32m\]\h\[\e[01;34m\] \w" "\[\e[01;34m\]\$\[\e[00m\] " " \[\e[01;34m\](%s\[\e[01;34m\])"
> >>    ~/src/git (master)$ git checkout 9470605a1b
> >>    HEAD is now at 9470605a1b git-prompt: make colourization consistent
> >>    ~/src/git ((9470605a1b...))$ source contrib/completion/git-prompt.sh
> >>    ~/src/git (\[\e[31m\](9470605a1b...)\[\e[0m\])$ # uh-oh
> >>    ~/src/git (\[\e[31m\](9470605a1b...)\[\e[0m\])$ git checkout 9470605a1b^
> >>    Previous HEAD position was 9470605a1b git-prompt: make colourization consistent
> >>    HEAD is now at 2668e3608e Sixth batch
> >>    ~/src/git (\[\e[31m\](2668e3608e...)\[\e[0m\])$ source contrib/completion/git-prompt.sh
> >>    ~/src/git ((2668e3608e...))$ # Looks good.
> >> 
> >
> > While I did test this on my own prompt for v6 (which is identical to v7
> > in terms of code) and not see any breakage, I have the same issue with
> > v7. Maybe I forgot to re-source the changed git-prompt.sh. Either way,
> > The issue stems from $b being wrapped in $__git_ps1_branch_name and then
> > back into itself after colouring. Moving this wrapping to before colour
> > is applied fixes this. I will submit a v8 shortly.
> 
> As the topic is already in 'next' (and presumably that is how SZEDER
> noticed the breakage),

Indeed. I usually use a custom git built from 'next' with a couple of my forever-WIP topics merged on top, and I just happened to build and deploy a version with this patch already merged the other day, with the additional stroke of luck that I opened a new terminal window (what I normally rarely do) whose shell sourced the buggy prompt script.

I did notice this patch being discussed on the ML, and found the amount of changes to the expected output in the tests somewhat suspicious, but, alas, haven't managed to take a closer look before the patch went into 'next'. Still hasn't, actually, but FWIW Joakim's fix (as 0e5d9ef395 in 'seen') does work for me.

Thanks, Gábor

Previous: Junio C HamanoNext: Joakim Petersen
Message 38 of 43 in “git-prompt: make colourization consistent”
  1. git-prompt: make colourization consistentJoakim Petersen, Jun 1, 2022
  2. Ævar Arnfjörð BjarmasonJun 1, 2022
  3. Joakim PetersenJun 1, 2022
  4. Junio C HamanoJun 1, 2022
  5. Joakim PetersenJun 1, 2022
  6. Junio C HamanoJun 1, 2022
  7. git-prompt: make colourization consistentJoakim Petersen, Jun 2, 2022
  8. joak-pet@online.noJun 2, 2022
  9. Junio C HamanoJun 2, 2022
  10. Joakim PetersenJun 3, 2022
  11. git-prompt: make colourization consistentJoakim Petersen, Jun 3, 2022
  12. Junio C HamanoJun 3, 2022
  13. Joakim PetersenJun 3, 2022
  14. Joakim PetersenJun 3, 2022
  15. Justin DonnellyJun 3, 2022
  16. Junio C HamanoJun 3, 2022
  17. Joakim PetersenJun 4, 2022
  18. Junio C HamanoJun 6, 2022
  19. Junio C HamanoJun 3, 2022
  20. git-prompt: make colourization consistentJoakim Petersen, Jun 4, 2022
  21. Justin DonnellyJun 4, 2022
  22. Joakim PetersenJun 4, 2022
  23. git-prompt: make colourization consistentJoakim Petersen, Jun 4, 2022
  24. Bagas SanjayaJun 6, 2022
  25. Junio C HamanoJun 7, 2022
  26. Joakim PetersenJun 9, 2022
  27. Junio C HamanoJun 6, 2022
  28. Joakim PetersenJun 6, 2022
  29. Junio C HamanoJun 6, 2022
  30. Joakim PetersenJun 7, 2022
  31. git-prompt: make colourization consistentJoakim Petersen, Jun 6, 2022
  32. git-prompt: make colourization consistentJoakim Petersen, Jun 7, 2022
  33. Junio C HamanoJun 7, 2022
  34. Joakim PetersenJun 9, 2022
  35. SZEDER GáborJun 9, 2022
  36. Joakim PetersenJun 9, 2022
  37. Junio C HamanoJun 9, 2022
  38. SZEDER GáborJun 11, 2022
  39. git-prompt: make colouring consistentJoakim Petersen, Jun 9, 2022
  40. git-prompt: fix expansion of branch colour codesJoakim Petersen, Jun 9, 2022
  41. Junio C HamanoJun 10, 2022
  42. Joakim PetersenJun 10, 2022
  43. git-prompt: fix expansion of branch colour codesJoakim Petersen, Jun 10, 2022

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.