[PATCH] use "up-to-date" in messages instead of "uptodate" for consistency
From: Nicolas Sebrecht <hidden>
Date: 2016-06-15 22:49:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nicolas Sebrecht <redacted> --- merge-recursive.c | 2 +- unpack-trees.c | 4 ++-- 2 files changed, 3 insertions(+), 3 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; }
diff --git a/unpack-trees.c b/unpack-trees.c
index 8cf0da3..024846e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c@@ -22,7 +22,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = { "Entry '%s' would be overwritten by merge. Cannot merge.", /* not_uptodate_file */ - "Entry '%s' not uptodate. Cannot merge.", + "Entry '%s' not up-to-date. Cannot merge.", /* not_uptodate_dir */ "Updating '%s' would lose untracked files in it",
@@ -34,7 +34,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = { "Entry '%s' overlaps with '%s'. Cannot bind.", /* sparse_not_uptodate_file */ - "Entry '%s' not uptodate. Cannot update sparse checkout.", + "Entry '%s' not up-to-date. Cannot update sparse checkout.", /* would_lose_orphaned */ "Working tree file '%s' would be %s by sparse checkout update.",
--
1.7.2.rc1.210.g7b476