From: Justin Donnelly <justinrdonnelly@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Justin Donnelly via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
newren@gmail.com, phillip.wood@dunelm.org.uk
Subject: Re: [PATCH v2] git-prompt: show presence of unresolved conflicts at command prompt
Date: Mon, 15 Aug 2022 23:36:08 -0400 [thread overview]
Message-ID: <CAGTqyRyBAR1SCpKwU2mTTKz0-nOPgJ1Es6aGVBgJqrnZ9Z_P1w@mail.gmail.com> (raw)
In-Reply-To: <r980s5q6-7714-8r0q-4sp1-3qs1458r17qs@tzk.qr>
On Mon, Aug 15, 2022 at 8:50 AM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
> Hi,
>
> On Sun, 14 Aug 2022, Junio C Hamano wrote:
>
> > Justin Donnelly <justinrdonnelly@gmail.com> writes:
> >
> > > I hope this is against protocol/etiquette, but after some initial
> > > feedback from Junio, I haven't gotten any more. I wasn't sure if
> > > nobody had seen the patch, or if there just wasn't any interest.
> >
> > It probably is a bit of both. I personally did not see much point
> > in adding the long "conflicts" marker to the shell prompt (I did
> > worry about possible complaints by end users triggered by seeing
> > them suddenly without asking, which was why I commented on the
> > patch) and I was waiting for interested folks to speak out.
>
> Speaking for myself, I was too busy elsewhere. But now that I looked over
> the patch, I think it is fine. My only feedback is that it would be wise
> to only add a single test case because that is plenty enough (after all,
> it validates the `ls-files --unmerged` call and not the `cherry-pick`
> code) and it is unnecessary to waste the electricity on additional tests
> cases (even if somebody else foots the bill, it would do well for all of
> us to start being more mindful about energy consumption).
That makes sense. I'll get started on a re-roll to just have a single
test that focuses specifically on the conflict indicator.
>
> Ciao,
> Dscho
Thanks,
Justin
next prev parent reply other threads:[~2022-08-16 7:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-26 1:23 [PATCH] git-prompt: show 'CONFLICT' indicator at command prompt Justin Donnelly via GitGitGadget
2022-07-27 20:13 ` Junio C Hamano
2022-07-28 2:17 ` Justin Donnelly
2022-07-28 17:44 ` Junio C Hamano
2022-07-28 23:33 ` Justin Donnelly
2022-07-29 22:08 ` [PATCH v2] git-prompt: show presence of unresolved conflicts " Justin Donnelly via GitGitGadget
2022-08-14 21:06 ` Justin Donnelly
2022-08-15 4:22 ` Junio C Hamano
2022-08-15 12:50 ` Johannes Schindelin
2022-08-16 3:36 ` Justin Donnelly [this message]
2022-08-15 13:04 ` Phillip Wood
2022-08-15 16:00 ` Junio C Hamano
2022-08-16 4:20 ` Justin Donnelly
2022-08-16 23:32 ` Justin Donnelly
2022-08-17 0:18 ` [PATCH v3] " Justin Donnelly via GitGitGadget
2022-08-19 11:29 ` Johannes Schindelin
2022-08-19 17:57 ` Junio C Hamano
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=CAGTqyRyBAR1SCpKwU2mTTKz0-nOPgJ1Es6aGVBgJqrnZ9Z_P1w@mail.gmail.com \
--to=justinrdonnelly@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).