[PATCH 0/1] Improve unpack trees error text

[PATCH 0/1] Improve unpack trees error text

[Venkat Naidu via GitGitGadget]

Improve the following error text:error: Entry 'file.txt' not uptodate.
Cannot merge.It would not appear as:error: Entry 'file.txt' is not up to
date. Cannot merge.

naiduv (1):
  Improve unpack trees error text

 t/t7110-reset-merge.sh | 4 ++--
 unpack-trees.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-447%2Fnaiduv%2Fpatch-2-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-447/naiduv/patch-2-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/447
-- 
gitgitgadget

[PATCH 1/1] Improve unpack trees error text

[naiduv via GitGitGadget]

From: naiduv <naiduvenkat@gmail.com>

Signed-off-by: naiduv <naiduvenkat@gmail.com>
---
 t/t7110-reset-merge.sh | 4 ++--
 unpack-trees.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index a82a07a04a..9b2298bfb3 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 33ea7810d8..74c348d40e 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
 	"Entry '%s' would be overwritten by merge. Cannot merge.",
 
 	/* ERROR_NOT_UPTODATE_FILE */
-	"Entry '%s' not uptodate. Cannot merge.",
+	"Entry '%s' is not up to date. Cannot merge.",
 
 	/* ERROR_NOT_UPTODATE_DIR */
 	"Updating '%s' would lose untracked files in it",
@@ -44,7 +44,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
 	"Entry '%s' overlaps with '%s'.  Cannot bind.",
 
 	/* ERROR_SPARSE_NOT_UPTODATE_FILE */
-	"Entry '%s' not uptodate. Cannot update sparse checkout.",
+	"Entry '%s' is not up to date. Cannot update sparse checkout.",
 
 	/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
 	"Working tree file '%s' would be overwritten by sparse checkout update.",
-- 
gitgitgadget

Re: [PATCH 1/1] Improve unpack trees error text

[Elijah Newren]

Hi,

Thanks for the contribution.  Looks like we were on similar
wavelengths, as I also contributed a fix to this phrasing just a
quarter of a day before you:
https://public-inbox.org/git/466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com/

On Tue, Nov 5, 2019 at 3:15 PM naiduv via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: naiduv <naiduvenkat@gmail.com>
>
> Signed-off-by: naiduv <naiduvenkat@gmail.com>
> ---
>  t/t7110-reset-merge.sh | 4 ++--
>  unpack-trees.c         | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
> index a82a07a04a..9b2298bfb3 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 33ea7810d8..74c348d40e 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
>         "Entry '%s' would be overwritten by merge. Cannot merge.",
>
>         /* ERROR_NOT_UPTODATE_FILE */
> -       "Entry '%s' not uptodate. Cannot merge.",
> +       "Entry '%s' is not up to date. Cannot merge.",

According to https://writingexplained.org/up-to-date-hyphenated, "up
to date" is an adverb phrase (which would not be correct to use here),
while "up-to-date" is the adjectival phrase.

>         /* ERROR_NOT_UPTODATE_DIR */
>         "Updating '%s' would lose untracked files in it",
> @@ -44,7 +44,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
>         "Entry '%s' overlaps with '%s'.  Cannot bind.",
>
>         /* ERROR_SPARSE_NOT_UPTODATE_FILE */
> -       "Entry '%s' not uptodate. Cannot update sparse checkout.",
> +       "Entry '%s' is not up to date. Cannot update sparse checkout.",
>
>         /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
>         "Working tree file '%s' would be overwritten by sparse checkout update.",

This patch misses a similar usage within gitk that would need to be
updated for this change.