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

Re: [PATCH] "not uptodate" changed to "has local changes"

From
ARAndré Goddard Rosa <andre.goddard@gmail.com>
Date
May 17, 2008, 03:30 UTC
Message-ID
<b8bf37780805162030m4c961505nabd72e8f5bd08404@mail.gmail.com>
In-Reply-To
<1ED37CF1-EABD-4881-BA29-ED2CB1CE73FC@sb.org>
On Fri, May 16, 2008 at 2:12 PM, Kevin Ballard <kevin@sb.org> wrote:
Show 19 quoted lines
> On May 16, 2008, at 6:25 AM, Johannes Schindelin wrote:
>
>> On Thu, 15 May 2008, André Goddard Rosa wrote:
>>
>>>>> This patch will make git a little more human friendly, reporting
>>>>> "file.txt: has local changes".
>>>>
>>>> Documentation/git-checkout.txt should also change in this case,
>>>> otherwise users will see different output to that described and
>>>> possibly get confused if following along with the examples.
>>>>
>>>
>>> I like the idea too.
>>
>> No comment on the concern that it might break people's scripts?  None?
>
>
> How about an ugly hack? Look to see if stdout is a tty, if so spit out the
> more human-readable version, otherwise spit out the old version >:-)

Is this user interface set on stone? I think we should reserve the right to improve always.

I would deprecate the current message, but I think that most users cannot find so much of a sense in the former message, although the script developer can easily change his scripts to search for ´cannot merge´ instead.

Do you have a better idea?

--- [PATCH] "not uptodate" changed to "has local changes"

Use more straightforward message for regular user.
Signed-off-by: Andre Goddard Rosa <andre.goddard@gmail.com>
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index a644173..624dea6 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -168,7 +168,7 @@ the above checkout would fail like this:
 +
 ------------
 $ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+fatal: Entry 'frotz' not uptodate, it has local changes. Cannot merge.
 ------------
 +
 You can give the `-m` flag to the command, which would try a
Previous: Kevin BallardNext: Johannes Schindelin
Message 9 of 24 in “"not uptodate" changed to "has local changes"”
  1. "not uptodate" changed to "has local changes"Tim Harper, May 3, 2008
  2. Mike RalphsonMay 6, 2008
  3. André Goddard RosaMay 16, 2008
  4. Johannes SchindelinMay 16, 2008
  5. Holger SchurigMay 16, 2008
  6. Francis MoreauMay 16, 2008
  7. Johannes SchindelinMay 16, 2008
  8. Kevin BallardMay 16, 2008
  9. André Goddard RosaMay 17, 2008
  10. Johannes SchindelinMay 17, 2008
  11. Steven WalterMay 17, 2008
  12. Sverre RabbelierMay 17, 2008
  13. Johannes SchindelinMay 17, 2008
  14. Sverre RabbelierMay 17, 2008
  15. Re* [PATCH] "not uptodate" changed to "has local changes"Junio C Hamano, May 17, 2008
  16. Sverre RabbelierMay 17, 2008
  17. Wincent ColaiutaMay 19, 2008
  18. Junio C HamanoMay 19, 2008
  19. Sverre RabbelierMay 19, 2008
  20. Daniel BarkalowMay 19, 2008
  21. Junio C HamanoMay 21, 2008
  22. Wincent ColaiutaMay 17, 2008
  23. Matthieu MoyMay 17, 2008
  24. Sverre RabbelierMay 18, 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.