Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@xxxxxx>
---
The 06/07/10, Ævar Arnfjörð Bjarmason wrote:
> Did you run the tests after applying this patch? This looks like it would break:
>
> t/t7110-reset-merge.sh
> 176: grep file1 err.log | grep "not uptodate"
> 192: grep file1 err.log | grep "not uptodate"
I forgot about them. Thanks for a reminder.
Documentation/git-checkout.txt | 2 +-
merge-recursive.c | 2 +-
t/t7110-reset-merge.sh | 4 ++--
unpack-trees.c | 4 ++--
4 files changed, 6 insertions(+), 6 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;
}
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index 70cdd8e..6a5f78d 100755
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -173,7 +173,7 @@ test_expect_success 'reset --merge fails with changes in file it touches' '
sed -e "s/line 1/changed line 1/" <file1 >file3 &&
mv file3 file1 &&
test_must_fail git reset --merge HEAD^ 2>err.log &&
- grep file1 err.log | grep "not uptodate"
+ grep file1 err.log | grep "not up-to-date"
'
# The next test will test the following:
@@ -189,7 +189,7 @@ test_expect_success 'reset --keep fails with changes in file it touches' '
sed -e "s/line 1/changed line 1/" <file1 >file3 &&
mv file3 file1 &&
test_must_fail git reset --keep HEAD^ 2>err.log &&
- grep file1 err.log | grep "not uptodate"
+ grep file1 err.log | grep "not up-to-date"
'
test_expect_success 'setup 3 different branches' '
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.212.g4c287
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html