Re: [PATCH v2] git-prompt: show presence of unresolved conflicts at command prompt

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Aug 15, 2022, 13:04 UTC
Message-ID: <08a8e78d-7861-3da3-f6f6-bba466655071@gmail.com>
In-Reply-To: <xmqqy1vq3zm3.fsf@gitster.g>

Hi

On 15/08/2022 05:22, Junio C Hamano wrote:

Show 19 quoted lines

> 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