{"thread":{"id":"42710","subject":"[PATCH v2] unpack-trees: fix English grammar in do-this-before-that messages","startedAt":"2016-06-25T06:34:17Z","lastAt":"2016-06-25T06:34:17Z","messageCount":1,"participants":["Alex Henrie"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"290111","messageId":"20160625063404.1623-1-alexhenrie24@gmail.com","threadId":"42710","inReplyTo":null,"subject":"[PATCH v2] unpack-trees: fix English grammar in do-this-before-that messages","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2016-06-25T06:34:04Z","receivedAt":"2016-06-25T06:34:17Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n t/t1011-read-tree-sparse-checkout.sh |  2 +-\n t/t7607-merge-overwrite.sh           |  2 +-\n t/t7609-merge-co-error-msgs.sh       | 10 +++++-----\n unpack-trees.c                       | 18 +++++++++---------\n 4 files changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh\nindex 0c74bee..1d8d751 100755\n--- a/t/t1011-read-tree-sparse-checkout.sh\n+++ b/t/t1011-read-tree-sparse-checkout.sh\n@@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update worktree' '\n error: The following untracked working tree files would be overwritten by checkout:\n \tsub/added\n \tsub/addedtoo\n-Please move or remove them before you can switch branches.\n+Please move or remove them before you switch branches.\n Aborting\n EOF\n \ttest_cmp expected actual\ndiff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh\nindex 758a623..1c59349 100755\n--- a/t/t7607-merge-overwrite.sh\n+++ b/t/t7607-merge-overwrite.sh\n@@ -115,7 +115,7 @@ cat >expect <<\\EOF\n error: The following untracked working tree files would be overwritten by merge:\n \tsub\n \tsub2\n-Please move or remove them before you can merge.\n+Please move or remove them before you merge.\n Aborting\n EOF\n \ndiff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh\nindex 6729cb3..f80bdb8 100755\n--- a/t/t7609-merge-co-error-msgs.sh\n+++ b/t/t7609-merge-co-error-msgs.sh\n@@ -31,7 +31,7 @@ error: The following untracked working tree files would be overwritten by merge:\n \tfour\n \tthree\n \ttwo\n-Please move or remove them before you can merge.\n+Please move or remove them before you merge.\n Aborting\n EOF\n \n@@ -53,10 +53,10 @@ error: Your local changes to the following files would be overwritten by merge:\n \tfour\n \tthree\n \ttwo\n-Please commit your changes or stash them before you can merge.\n+Please commit your changes or stash them before you merge.\n error: The following untracked working tree files would be overwritten by merge:\n \tfive\n-Please move or remove them before you can merge.\n+Please move or remove them before you merge.\n Aborting\n EOF\n \n@@ -72,7 +72,7 @@ cat >expect <<\\EOF\n error: Your local changes to the following files would be overwritten by checkout:\n \trep/one\n \trep/two\n-Please commit your changes or stash them before you can switch branches.\n+Please commit your changes or stash them before you switch branches.\n Aborting\n EOF\n \n@@ -94,7 +94,7 @@ cat >expect <<\\EOF\n error: Your local changes to the following files would be overwritten by checkout:\n \trep/one\n \trep/two\n-Please commit your changes or stash them before you can switch branches.\n+Please commit your changes or stash them before you switch branches.\n Aborting\n EOF\n \ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 6bc9512..11c37fb 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\"\n-\t\t\t  \"Please commit your changes or stash them before you can switch branches.\")\n+\t\t\t  \"Please commit your changes or stash them before you switch branches.\")\n \t\t      : _(\"Your local changes to the following files would be overwritten by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"Your local changes to the following files would be overwritten by merge:\\n%%s\"\n-\t\t\t  \"Please commit your changes or stash them before you can merge.\")\n+\t\t\t  \"Please commit your changes or stash them before you merge.\")\n \t\t      : _(\"Your local changes to the following files would be overwritten by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"Your local changes to the following files would be overwritten by %s:\\n%%s\"\n-\t\t\t  \"Please commit your changes or stash them before you can %s.\")\n+\t\t\t  \"Please commit your changes or stash them before you %s.\")\n \t\t      : _(\"Your local changes to the following files would be overwritten by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =\n \t\txstrfmt(msg, cmd, cmd);\n@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,\n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be removed by checkout:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can switch branches.\")\n+\t\t\t  \"Please move or remove them before you switch branches.\")\n \t\t      : _(\"The following untracked working tree files would be removed by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be removed by merge:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can merge.\")\n+\t\t\t  \"Please move or remove them before you merge.\")\n \t\t      : _(\"The following untracked working tree files would be removed by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be removed by %s:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can %s.\")\n+\t\t\t  \"Please move or remove them before you %s.\")\n \t\t      : _(\"The following untracked working tree files would be removed by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);\n \n \tif (!strcmp(cmd, \"checkout\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be overwritten by checkout:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can switch branches.\")\n+\t\t\t  \"Please move or remove them before you switch branches.\")\n \t\t      : _(\"The following untracked working tree files would be overwritten by checkout:\\n%%s\");\n \telse if (!strcmp(cmd, \"merge\"))\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be overwritten by merge:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can merge.\")\n+\t\t\t  \"Please move or remove them before you merge.\")\n \t\t      : _(\"The following untracked working tree files would be overwritten by merge:\\n%%s\");\n \telse\n \t\tmsg = advice_commit_before_merge\n \t\t      ? _(\"The following untracked working tree files would be overwritten by %s:\\n%%s\"\n-\t\t\t  \"Please move or remove them before you can %s.\")\n+\t\t\t  \"Please move or remove them before you %s.\")\n \t\t      : _(\"The following untracked working tree files would be overwritten by %s:\\n%%s\");\n \tmsgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);\n \n-- \n2.9.0\n\n"}]}