{"thread":{"id":"52196","subject":"[PATCH 1/1] Improve unpack trees error text","startedAt":"2019-11-05T23:13:06Z","lastAt":"2019-11-05T23:49:35Z","messageCount":3,"participants":["naiduv via GitGitGadget","Venkat Naidu via GitGitGadget","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"385492","messageId":"51df6661f772b08eef709fcc36ba11a158ba6fad.1572995581.git.gitgitgadget@gmail.com","threadId":"52196","inReplyTo":"pull.447.git.1572995581.gitgitgadget@gmail.com","subject":"[PATCH 1/1] Improve unpack trees error text","fromName":"naiduv via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-05T23:13:01Z","receivedAt":"2019-11-05T23:13:06Z","isPatch":true,"sender":{"key":"name:naiduv","avatar":null},"body":"From: naiduv <naiduvenkat@gmail.com>\n\nSigned-off-by: naiduv <naiduvenkat@gmail.com>\n---\n t/t7110-reset-merge.sh | 4 ++--\n unpack-trees.c         | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh\nindex a82a07a04a..9b2298bfb3 100755\n--- a/t/t7110-reset-merge.sh\n+++ b/t/t7110-reset-merge.sh\n@@ -173,7 +173,7 @@ test_expect_success 'reset --merge fails with changes in file it touches' '\n     sed -e \"s/line 1/changed line 1/\" <file1 >file3 &&\n     mv file3 file1 &&\n     test_must_fail git reset --merge HEAD^ 2>err.log &&\n-    grep file1 err.log | grep \"not uptodate\"\n+    grep file1 err.log | grep \"not up to date\"\n '\n \n # The next test will test the following:\n@@ -189,7 +189,7 @@ test_expect_success 'reset --keep fails with changes in file it touches' '\n     sed -e \"s/line 1/changed line 1/\" <file1 >file3 &&\n     mv file3 file1 &&\n     test_must_fail git reset --keep HEAD^ 2>err.log &&\n-    grep file1 err.log | grep \"not uptodate\"\n+    grep file1 err.log | grep \"not up to date\"\n '\n \n test_expect_success 'setup 3 different branches' '\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 33ea7810d8..74c348d40e 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {\n \t\"Entry '%s' would be overwritten by merge. Cannot merge.\",\n \n \t/* ERROR_NOT_UPTODATE_FILE */\n-\t\"Entry '%s' not uptodate. Cannot merge.\",\n+\t\"Entry '%s' is not up to date. Cannot merge.\",\n \n \t/* ERROR_NOT_UPTODATE_DIR */\n \t\"Updating '%s' would lose untracked files in it\",\n@@ -44,7 +44,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {\n \t\"Entry '%s' overlaps with '%s'.  Cannot bind.\",\n \n \t/* ERROR_SPARSE_NOT_UPTODATE_FILE */\n-\t\"Entry '%s' not uptodate. Cannot update sparse checkout.\",\n+\t\"Entry '%s' is not up to date. Cannot update sparse checkout.\",\n \n \t/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */\n \t\"Working tree file '%s' would be overwritten by sparse checkout update.\",\n-- \ngitgitgadget\n"},{"id":"385493","messageId":"pull.447.git.1572995581.gitgitgadget@gmail.com","threadId":"52196","inReplyTo":null,"subject":"[PATCH 0/1] Improve unpack trees error text","fromName":"Venkat Naidu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-11-05T23:13:00Z","receivedAt":"2019-11-05T23:13:07Z","isPatch":true,"sender":{"key":"name:Venkat Naidu","avatar":null},"body":"Improve the following error text:error: Entry 'file.txt' not uptodate.\nCannot merge.It would not appear as:error: Entry 'file.txt' is not up to\ndate. Cannot merge.\n\nnaiduv (1):\n  Improve unpack trees error text\n\n t/t7110-reset-merge.sh | 4 ++--\n unpack-trees.c         | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\n\nbase-commit: da72936f544fec5a335e66432610e4cef4430991\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-447%2Fnaiduv%2Fpatch-2-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-447/naiduv/patch-2-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/447\n-- \ngitgitgadget\n"},{"id":"385498","messageId":"CABPp-BFDyMxre=gp64sgHyZtMbe-EL=ke3b5FA6CwsqbcdyJBQ@mail.gmail.com","threadId":"52196","inReplyTo":"51df6661f772b08eef709fcc36ba11a158ba6fad.1572995581.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] Improve unpack trees error text","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2019-11-05T23:49:21Z","receivedAt":"2019-11-05T23:49:35Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi,\n\nThanks for the contribution.  Looks like we were on similar\nwavelengths, as I also contributed a fix to this phrasing just a\nquarter of a day before you:\nhttps://public-inbox.org/git/466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com/\n\nOn Tue, Nov 5, 2019 at 3:15 PM naiduv via GitGitGadget\n<gitgitgadget@gmail.com> wrote:\n>\n> From: naiduv <naiduvenkat@gmail.com>\n>\n> Signed-off-by: naiduv <naiduvenkat@gmail.com>\n> ---\n>  t/t7110-reset-merge.sh | 4 ++--\n>  unpack-trees.c         | 4 ++--\n>  2 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh\n> index a82a07a04a..9b2298bfb3 100755\n> --- a/t/t7110-reset-merge.sh\n> +++ b/t/t7110-reset-merge.sh\n> @@ -173,7 +173,7 @@ test_expect_success 'reset --merge fails with changes in file it touches' '\n>      sed -e \"s/line 1/changed line 1/\" <file1 >file3 &&\n>      mv file3 file1 &&\n>      test_must_fail git reset --merge HEAD^ 2>err.log &&\n> -    grep file1 err.log | grep \"not uptodate\"\n> +    grep file1 err.log | grep \"not up to date\"\n>  '\n>\n>  # The next test will test the following:\n> @@ -189,7 +189,7 @@ test_expect_success 'reset --keep fails with changes in file it touches' '\n>      sed -e \"s/line 1/changed line 1/\" <file1 >file3 &&\n>      mv file3 file1 &&\n>      test_must_fail git reset --keep HEAD^ 2>err.log &&\n> -    grep file1 err.log | grep \"not uptodate\"\n> +    grep file1 err.log | grep \"not up to date\"\n>  '\n>\n>  test_expect_success 'setup 3 different branches' '\n> diff --git a/unpack-trees.c b/unpack-trees.c\n> index 33ea7810d8..74c348d40e 100644\n> --- a/unpack-trees.c\n> +++ b/unpack-trees.c\n> @@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {\n>         \"Entry '%s' would be overwritten by merge. Cannot merge.\",\n>\n>         /* ERROR_NOT_UPTODATE_FILE */\n> -       \"Entry '%s' not uptodate. Cannot merge.\",\n> +       \"Entry '%s' is not up to date. Cannot merge.\",\n\nAccording to https://writingexplained.org/up-to-date-hyphenated, \"up\nto date\" is an adverb phrase (which would not be correct to use here),\nwhile \"up-to-date\" is the adjectival phrase.\n\n>         /* ERROR_NOT_UPTODATE_DIR */\n>         \"Updating '%s' would lose untracked files in it\",\n> @@ -44,7 +44,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {\n>         \"Entry '%s' overlaps with '%s'.  Cannot bind.\",\n>\n>         /* ERROR_SPARSE_NOT_UPTODATE_FILE */\n> -       \"Entry '%s' not uptodate. Cannot update sparse checkout.\",\n> +       \"Entry '%s' is not up to date. Cannot update sparse checkout.\",\n>\n>         /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */\n>         \"Working tree file '%s' would be overwritten by sparse checkout update.\",\n\nThis patch misses a similar usage within gitk that would need to be\nupdated for this change.\n"}]}