git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.

From
Tim Harper <timcharper@gmail.com>
Date
May 6, 2008, 21:50 UTC
Message-ID
<F1DEC707-3E1B-4211-9F97-171D01B13A8E@gmail.com>
In-Reply-To
<32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com>
Yeah: I was thinking about it earlier and came at the same conclusion.

There's a "porcelain" interface for a lot of commands. Does the concept need to be furthered for this case?

On another note - I've been running with this change for several days, and everything seems to be alright.

Tim
On May 5, 2008, at 10:35 AM, Avery Pennarun wrote:
Show 18 quoted lines
> On 5/3/08, Junio C Hamano <gitster@pobox.com> wrote:
>> "Avery Pennarun" <apenwarr@gmail.com> writes:
>>> On 5/3/08, Junio C Hamano <gitster@pobox.com> wrote:
>>>> Of course not.  Where does end-user scripts come into play when  
>>>> you are
>>>> running the testsuite?
>>>
>>> I thought user scripts weren't supposed to rely on the porcelain
>>> output?  It seems to change rather frequently anyway.
>>
>> Wasn't the patch about changing output from "update-index --refresh",
>> which is as low as you can get?
>
> Hmm, perhaps the problem then is that we're using plumbing output and
> presenting it to the user as part of the porcelain.  Is there an
> elegant way to fix that?
>
> Avery
Previous: Jeff KingNext: Johannes Schindelin
Message 11 of 13 in “I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.”
  1. I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.Tim Harper, May 3, 2008
  2. Johannes SchindelinMay 3, 2008
  3. Tim HarperMay 3, 2008
  4. Junio C HamanoMay 3, 2008
  5. Tim HarperMay 3, 2008
  6. Junio C HamanoMay 4, 2008
  7. Avery PennarunMay 4, 2008
  8. Junio C HamanoMay 4, 2008
  9. Avery PennarunMay 5, 2008
  10. Jeff KingMay 5, 2008
  11. Tim HarperMay 6, 2008
  12. Johannes SchindelinMay 4, 2008
  13. Matt GrahamMay 3, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.