git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
	Justin Donnelly <justinrdonnelly@gmail.com>
Cc: "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,
	Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v2] git-prompt: show presence of unresolved conflicts at command prompt
Date: Mon, 15 Aug 2022 14:04:50 +0100	[thread overview]
Message-ID: <08a8e78d-7861-3da3-f6f6-bba466655071@gmail.com> (raw)
In-Reply-To: <xmqqy1vq3zm3.fsf@gitster.g>

Hi

On 15/08/2022 05:22, 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.
> 
> I do not know about other folks if they did see and did not find it
> interesting, they are not looking at others' work, or your second
> round came on a particularly bad day (busy with other topics, or
> weekend just before the list was swamped with many new topics at the
> beginning of a new week, or something).  Pinging on the thread like
> you did would be the right thing to do to "kick" those, who did see
> and who were in favor but who kept silent, into action ;-)

I had not commented as I don't use the prompt. I have just had a quick 
read and I wonder if it would be more efficient to use
     git diff --cached --quiet --diff-filter=U
rather than
     git ls-files --unmerged 2>/dev/null
to check if there are unmerged entries, but as we don't normally expect 
there to be that many unmerged entries it probably does not matter.

Best Wishes

Phillip

  parent reply	other threads:[~2022-08-15 13:05 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
2022-08-15 13:04       ` Phillip Wood [this message]
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=08a8e78d-7861-3da3-f6f6-bba466655071@gmail.com \
    --to=phillip.wood123@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=justinrdonnelly@gmail.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).