Re: [PATCH] git-prompt: GIT_PS1_SHOWCONFLICTSTATE variable fix

From: Michiel Beijen <mb@x14.nl>
To: Justin Donnelly <justinrdonnelly@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-prompt: GIT_PS1_SHOWCONFLICTSTATE variable fix
Date: Sun, 24 Mar 2024 18:18:04 +0100	[thread overview]
Message-ID: <379141b4-d715-41b9-973f-ec0349ed11a5@x14.nl> (raw)
In-Reply-To: <CAGTqyRykxy2GJV6b4yavWnegbz0HwykaT7bExOXK4wENdoF+Qg@mail.gmail.com>

On 19-03-2024 23:58, Justin Donnelly wrote:

> Hi Michiel,
> This is my code, so I'm really glad somebody else finds it useful!
>
>
> On Tue, Mar 19, 2024 at 4:33 PM Michiel W. Beijen <mb@x14.nl> wrote:
>> There are a few environment variables that can influence the output for
>> the __git_ps1 macro in git-prompt.sh. All settings that are 'on/off'
>> types such as GIT_PS1_SHOWUNTRACKEDFILES and GIT_PS1_SHOWDIRTYSTATE
>> just take any value, and in the tests are tested with 'y', however
>> GIT_PS1_SHOWCONFLICTSTATE must be set to 'yes' otherwise it will not
>> work.
> I had actually considered using set/unset (for the same reason as you
> - consistency), but was advised to use a boolean flag.
>
> See: https://marc.info/?l=git&m=165897458021238&w=2 and
> https://marc.info/?l=git&m=165903017715652&w=2

I read the comments in that thread. While requiring the setting be set 
to 'yes' explicitly might make it possible to change it to a three-way 
switch in some unknown future, I think right now it is confusing and 
strange that of the many settings for GIT_PS1 only this one requires the 
explicit value 'yes'.

So I would still request to consider this change.

--

Michiel