Re: [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

Nicolas Sebrecht [off-list ref] writes:

Signed-off-by: Nicolas Sebrecht <redacted>
---

The 07/07/10, Junio C Hamano wrote:

quoted

The "struct unpack_trees_error_msgs" mechanism was introduced so that we
can change the Porcelain level messages without breaking the plumbing API,
which these messages are part of.  Please see 8ccba00 (unpack-trees: allow
Porcelain to give different error messages, 2008-05-17) and fadd069
(merge-recursive: give less scary messages when merge did not start,
2009-09-07) for backstory.

Oh, thanks. I was unaware of this mechanism and didn't care about what I was
touching.

I suspect that the documentation patch talks about a nonexistent reality.
See 8ccba00 again ;-)

Signed-off-by: Nicolas Sebrecht <redacted>
---
 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 856e98c..fb6aa4a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c

@@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,
 	}
 
 	if (sha_eq(common->object.sha1, merge->object.sha1)) {
-		output(o, 0, "Already uptodate!");
+		output(o, 0, "Already up-to-date!");
 		*result = head;
 		return 1;
 	}

-- 
1.7.2.rc2.194.g494e9.dirty

Signed-off-by: Nicolas Sebrecht <redacted>
---

The 07/07/10, Junio C Hamano wrote:

Nicolas Sebrecht [off-list ref] writes:

quoted

Signed-off-by: Nicolas Sebrecht <redacted>
---

The 07/07/10, Junio C Hamano wrote:

quoted

The "struct unpack_trees_error_msgs" mechanism was introduced so that we
can change the Porcelain level messages without breaking the plumbing API,
which these messages are part of.  Please see 8ccba00 (unpack-trees: allow
Porcelain to give different error messages, 2008-05-17) and fadd069
(merge-recursive: give less scary messages when merge did not start,
2009-09-07) for backstory.

Oh, thanks. I was unaware of this mechanism and didn't care about what I was
touching.

I suspect that the documentation patch talks about a nonexistent reality.
See 8ccba00 again ;-)

Doh! You said in this commit that

	"If you do not see something wrong with this output, your brain has already
	been rotten with use of git for too long a time."

but I claim the right to be rotten in much more ways. :-)

 Documentation/git-checkout.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 261dd90..1bacd2e 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt

@@ -263,7 +263,7 @@ the above checkout would fail like this:
 +
 ------------
 $ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+error: You have local changes to 'frotz'; not switching branches.
 ------------
 +
 You can give the `-m` flag to the command, which would try a

-- 
1.7.2.rc2.194.g494e9.dirty

Nicolas Sebrecht [off-list ref] writes:

Doh! You said in this commit that

	"If you do not see something wrong with this output, your brain has already
	been rotten with use of git for too long a time."

but I claim the right to be rotten in much more ways. :-)

Heh; thanks.

Nicolas Sebrecht [off-list ref] writes:

Sorry, but the pros-and-cons is not good enough for me to support this
change.  It will break users who have been parsing output with scripts.

We do strongly warn people against relying on Porcelain output, but that
does not mean we are free to change them without having a good reason or
two.  The new spelling won't help the next reader who will find the
message confusing the same way you did a few days ago.

IOW, if we are touching this line anyway, I'd like to make sure we made an
effort to make it less confusing, not just spelled correctly, while we
still have our memory of confusion fresh ;-)