From: Joakim Petersen <joak-pet@online.no>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Justin Donnelly" <justinrdonnelly@gmail.com>
Subject: Re: [PATCH v2] git-prompt: make colourization consistent
Date: Fri, 3 Jun 2022 15:55:51 +0200 [thread overview]
Message-ID: <09d485f5-e3f0-be10-7061-bff6ef09a99a@online.no> (raw)
In-Reply-To: <xmqqilpiistk.fsf@gitster.g>
On 03/06/2022 00:49, Junio C Hamano wrote:
> Joakim Petersen <joak-pet@online.no> writes:
>
>> Range-diff against v1:
>> 1: e235caa7a8 = 1: e235caa7a8 git-prompt: make colourization consistent
>>
>> contrib/completion/git-prompt.sh | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
>> index 87b2b916c0..dfd6cef35f 100644
>> --- a/contrib/completion/git-prompt.sh
>> +++ b/contrib/completion/git-prompt.sh
>> @@ -286,6 +286,7 @@ __git_ps1_colorize_gitstring ()
>> if [ -n "$u" ]; then
>> u="$bad_color$u"
>> fi
>> + p="$c_clear$p"
>> r="$c_clear$r"
>> }
>
> Has this been tested?
>
> It seems to break a handful of tests in t9903 for me.
>
Oh, no I hadn't run the test suite, sorry. I must've gotten too caught
up in other parts of the submitting process and simply forgot to run
them. After looking into it, the reason why the tests fail is that $p is
no longer empty when it is not set, so $f is no longer empty, leading to
both $z and $p being inserted into $gitstring. This causes there to be
three clear-colour sequences in the final output instead of the expected
one. Wrapping the clearing of $p's colour in a check for emptiness like
the other short state indicators fixes the tests. I'll submit a v3
shortly.
next prev parent reply other threads:[~2022-06-03 13:56 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 [this message]
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
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=09d485f5-e3f0-be10-7061-bff6ef09a99a@online.no \
--to=joak-pet@online.no \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=justinrdonnelly@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).