From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Justin Donnelly via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Justin Donnelly <justinrdonnelly@gmail.com>
Subject: Re: [PATCH v2 0/4] In PS1 prompt, make upstream state indicators consistent with other state indicators
Date: Wed, 23 Mar 2022 13:06:57 -0700 [thread overview]
Message-ID: <xmqqa6dgsaam.fsf@gitster.g> (raw)
In-Reply-To: <220322.865yo6npg4.gmgdl@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Tue, 22 Mar 2022 13:25:35 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On Sun, Feb 27 2022, Justin Donnelly via GitGitGadget wrote:
>
>> These patches are about the characters and words that can be configured to
>> display in the PS1 prompt after the branch name. I've been unable to find a
>> consistent terminology. I refer to them as follows: [short | long] [type]
>> state indicator where short is for characters (e.g. ?), long is for words
>> (e.g. |SPARSE), and type is the type of indicator (e.g. sparse or upstream).
>> I'd be happy to change the commit messages to a different terminology if
>> that's preferred.
>>
>> There are a few inconsistencies with the PS1 prompt upstream state indicator
>> (GIT_PS1_SHOWUPSTREAM).
>>
>> * With GIT_PS1_SHOWUPSTREAM="auto", if there are no other short state
>> indicators (e.g. + for staged changes, $ for stashed changes, etc.), the
>> upstream state indicator appears adjacent to the branch name (e.g.
>> (main=)) instead of being separated by SP or GIT_PS1_STATESEPARATOR (e.g.
>> (main =)).
>> * If there are long state indicators (e.g. |SPARSE), a short upstream state
>> indicator (i.e. GIT_PS1_SHOWUPSTREAM="auto") is to the right of the long
>> state indicator (e.g. (main +|SPARSE=)) instead of with the other short
>> state indicators (e.g. (main +=|SPARSE)).
>> * The long upstream state indicator (e.g. GIT_PS1_SHOWUPSTREAM="verbose")
>> is separated from other (short or long) state indicators by a hard-coded
>> SP. Other long state indicators are separated by a hard-coded pipe (|).
>>
>> These patches are to make the upstream state indicators more consistent with
>> other state indicators.
>>
>> ----------------------------------------------------------------------------
>>
>> Changes since v1:
>>
>> * Added __git_ps1 examples and before/after tables to commit messages where
>> applicable. This should make it clearer what the behavior is for other
>> (not upstream) state indicators, and how the patches make the upstream
>> state indicator more consistent.
>> * Removed some extraneous information about long state indicators from
>> patch 2 commit message. This wasn't really helpful, and was a
>> distraction.
>
> Since this was all in reponse to my review: I've looked this over again
> and this all LGTM now:
>
> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Thanks, both.
prev parent reply other threads:[~2022-03-23 20:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 11:44 [PATCH 0/4] In PS1 prompt, make upstream state indicators consistent with other state indicators Justin Donnelly via GitGitGadget
2022-02-25 11:44 ` [PATCH 1/4] git-prompt: rename `upstream` to `upstream_type` Justin Donnelly via GitGitGadget
2022-02-25 11:44 ` [PATCH 2/4] git-prompt: make upstream state indicator location consistent Justin Donnelly via GitGitGadget
2022-02-25 11:44 ` [PATCH 3/4] git-prompt: make long upstream state indicator consistent Justin Donnelly via GitGitGadget
2022-02-25 11:44 ` [PATCH 4/4] git-prompt: put upstream comments together Justin Donnelly via GitGitGadget
2022-02-25 12:22 ` [PATCH 0/4] In PS1 prompt, make upstream state indicators consistent with other state indicators Ævar Arnfjörð Bjarmason
2022-02-27 0:32 ` Justin Donnelly
2022-02-27 10:19 ` Ævar Arnfjörð Bjarmason
2022-02-27 19:57 ` [PATCH v2 " Justin Donnelly via GitGitGadget
2022-02-27 19:57 ` [PATCH v2 1/4] git-prompt: rename `upstream` to `upstream_type` Justin Donnelly via GitGitGadget
2022-02-27 19:57 ` [PATCH v2 2/4] git-prompt: make upstream state indicator location consistent Justin Donnelly via GitGitGadget
2022-02-27 19:57 ` [PATCH v2 3/4] git-prompt: make long upstream state indicator consistent Justin Donnelly via GitGitGadget
2022-02-27 19:57 ` [PATCH v2 4/4] git-prompt: put upstream comments together Justin Donnelly via GitGitGadget
2022-03-22 12:25 ` [PATCH v2 0/4] In PS1 prompt, make upstream state indicators consistent with other state indicators Ævar Arnfjörð Bjarmason
2022-03-23 20:06 ` Junio C Hamano [this message]
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=xmqqa6dgsaam.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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).