On Fri, May 16, 2008 at 2:12 PM, Kevin Ballard <kevin@sb.org> wrote:
quoted text
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html