[PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
- From
- Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
- Date
- Jul 7, 2010, 07:54 UTC
- Message-ID
- <9aea70210996b395f5fc04ae48a372f9b51ba182.1278489069.git.nicolas.s.dev@gmx.fr>
- In-Reply-To
- <7vbpajzro3.fsf@alter.siamese.dyndns.org>
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> ---
The 07/07/10, Junio C Hamano wrote:
Show 6 quoted lines
> 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.
Documentation/git-checkout.txt | 2 +- merge-recursive.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 261dd90..c04eceb 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. +fatal: Entry 'frotz' not up-to-date. Cannot merge. ------------ + You can give the `-m` flag to the command, which would try a 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.rc1.214.g95a9e