From: Junio C Hamano <gitster@pobox.com>
To: Joakim Petersen <joak-pet@online.no>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Justin Donnelly" <justinrdonnelly@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>
Subject: Re: [PATCH] git-prompt: fix expansion of branch colour codes
Date: Thu, 09 Jun 2022 17:05:47 -0700 [thread overview]
Message-ID: <xmqq4k0tgz6s.fsf@gitster.g> (raw)
In-Reply-To: <20220609204447.32841-1-joak-pet@online.no> (Joakim Petersen's message of "Thu, 9 Jun 2022 22:44:47 +0200")
Joakim Petersen <joak-pet@online.no> writes:
> Because of the wrapping of the branch name variable $b, the colour codes
> in the variable don't get applied, but are instead printed directly in
> the output. Move the wrapping of $b to before colour codes are inserted
> to correct this.
>
> Signed-off-by: Joakim Petersen <joak-pet@online.no>
> ---
> contrib/completion/git-prompt.sh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
t9903 seems to fail with this, though...?
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index cb01c2fd5d..1435548e00 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -556,9 +556,14 @@ __git_ps1 ()
> fi
> fi
>
> - b=${b##refs/heads/}
> local z="${GIT_PS1_STATESEPARATOR-" "}"
>
> + b=${b##refs/heads/}
> + if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
> + __git_ps1_branch_name=$b
> + b="\${__git_ps1_branch_name}"
> + fi
> +
> # NO color option unless in PROMPT_COMMAND mode or it's Zsh
> if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
> if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
> @@ -566,11 +571,6 @@ __git_ps1 ()
> fi
> fi
>
> - if [ $pcmode = yes ] && [ $ps1_expanded = yes ]; then
> - __git_ps1_branch_name=$b
> - b="\${__git_ps1_branch_name}"
> - fi
> -
> local f="$h$w$i$s$u$p"
> local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
>
>
> base-commit: 9470605a1b03dac8fc4f801132e36964b4fbb8c3
next prev parent reply other threads:[~2022-06-10 0:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-01 13:44 [RFC PATCH] git-prompt: make colourization consistent Joakim Petersen
2022-06-01 14:47 ` Ævar Arnfjörð Bjarmason
2022-06-01 18:26 ` Joakim Petersen
2022-06-01 18:07 ` Junio C Hamano
2022-06-01 18:32 ` Joakim Petersen
2022-06-01 20:45 ` Junio C Hamano
2022-06-02 14:59 ` [PATCH v2] " Joakim Petersen
2022-06-02 21:56 ` joak-pet
2022-06-02 22:49 ` Junio C Hamano
2022-06-03 13:55 ` Joakim Petersen
2022-06-03 14:25 ` [PATCH v3] " Joakim Petersen
2022-06-03 16:38 ` Junio C Hamano
2022-06-03 17:23 ` Joakim Petersen
2022-06-03 18:51 ` Joakim Petersen
2022-06-03 19:43 ` Justin Donnelly
2022-06-03 21:16 ` Junio C Hamano
2022-06-04 9:42 ` Joakim Petersen
2022-06-06 16:13 ` Junio C Hamano
2022-06-03 20:50 ` Junio C Hamano
2022-06-04 16:13 ` [PATCH v4] " Joakim Petersen
2022-06-04 17:30 ` Justin Donnelly
2022-06-04 19:18 ` Joakim Petersen
2022-06-04 19:26 ` [PATCH v5] " Joakim Petersen
2022-06-06 7:23 ` Bagas Sanjaya
2022-06-07 16:04 ` Junio C Hamano
2022-06-09 11:25 ` Joakim Petersen
2022-06-06 16:29 ` Junio C Hamano
2022-06-06 17:31 ` Joakim Petersen
2022-06-06 17:41 ` Junio C Hamano
2022-06-07 11:49 ` Joakim Petersen
2022-06-06 17:50 ` [PATCH v6] " Joakim Petersen
2022-06-07 11:50 ` [PATCH v7] " Joakim Petersen
2022-06-07 16:22 ` Junio C Hamano
2022-06-09 11:16 ` Joakim Petersen
2022-06-09 9:03 ` SZEDER Gábor
2022-06-09 11:13 ` Joakim Petersen
2022-06-09 18:29 ` Junio C Hamano
2022-06-11 9:01 ` SZEDER Gábor
2022-06-09 11:44 ` [PATCH v8] git-prompt: make colouring consistent Joakim Petersen
2022-06-09 20:44 ` [PATCH] git-prompt: fix expansion of branch colour codes Joakim Petersen
2022-06-10 0:05 ` Junio C Hamano [this message]
2022-06-10 0:33 ` Joakim Petersen
2022-06-10 0:47 ` [PATCH v2] " Joakim Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4k0tgz6s.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=joak-pet@online.no \
--cc=justinrdonnelly@gmail.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).