{"thread":{"id":"46473","subject":"[PATCH] remote: split and simplify messages","startedAt":"2017-07-26T13:18:45Z","lastAt":"2017-07-30T11:37:03Z","messageCount":4,"participants":["Kaartic Sivaraam"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"325124","messageId":"0102015d7f0c9403-16bd1de5-3b6c-4d23-a3fb-75a26c378c62-000000@eu-west-1.amazonses.com","threadId":"46473","inReplyTo":null,"subject":"[PATCH] remote: split and simplify messages","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-26T13:18:37Z","receivedAt":"2017-07-26T13:18:45Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"Splitting a single sentence across multiple lines could\ndegrade readability. Further, long messages are likely\nto be ignored by users.\n\nSplit the sentences and simplify it to improve their readability.\n\nSigned-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>\n---\n remote.c                   | 18 ++++-----\n t/t2020-checkout-detach.sh |  3 +-\n t/t7508-status.sh          | 96 +++++++++++++++++++++++-----------------------\n 3 files changed, 58 insertions(+), 59 deletions(-)\n\ndiff --git a/remote.c b/remote.c\nindex 60d004392109f..e4e241d5e20f4 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -2093,10 +2093,10 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)\n \t\t\t\t_(\"  (use \\\"git push\\\" to publish your local commits)\\n\"));\n \t} else if (!ours) {\n \t\tstrbuf_addf(sb,\n-\t\t\tQ_(\"Your branch is behind '%s' by %d commit, \"\n-\t\t\t       \"and can be fast-forwarded.\\n\",\n-\t\t\t   \"Your branch is behind '%s' by %d commits, \"\n-\t\t\t       \"and can be fast-forwarded.\\n\",\n+\t\t\tQ_(\"Your branch is behind '%s' by %d commit.\\n\"\n+\t\t\t       \"It can be fast-forwarded.\\n\",\n+\t\t\t   \"Your branch is behind '%s' by %d commits.\\n\"\n+\t\t\t       \"It can be fast-forwarded.\\n\",\n \t\t\t   theirs),\n \t\t\tbase, theirs);\n \t\tif (advice_status_hints)\n@@ -2104,12 +2104,10 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)\n \t\t\t\t_(\"  (use \\\"git pull\\\" to update your local branch)\\n\"));\n \t} else {\n \t\tstrbuf_addf(sb,\n-\t\t\tQ_(\"Your branch and '%s' have diverged,\\n\"\n-\t\t\t       \"and have %d and %d different commit each, \"\n-\t\t\t       \"respectively.\\n\",\n-\t\t\t   \"Your branch and '%s' have diverged,\\n\"\n-\t\t\t       \"and have %d and %d different commits each, \"\n-\t\t\t       \"respectively.\\n\",\n+\t\t\tQ_(\"Your branch and '%s' have diverged.\\n\"\n+\t\t\t       \"They have %d and %d different commit, respectively.\\n\",\n+\t\t\t   \"Your branch and '%s' have diverged.\\n\"\n+\t\t\t       \"They have %d and %d different commits, respectively.\\n\",\n \t\t\t   ours + theirs),\n \t\t\tbase, ours, theirs);\n \t\tif (advice_status_hints)\ndiff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh\nindex fbb4ee9bb42db..4e1c74c878560 100755\n--- a/t/t2020-checkout-detach.sh\n+++ b/t/t2020-checkout-detach.sh\n@@ -150,7 +150,8 @@ test_expect_success 'checkout does not warn leaving reachable commit' '\n '\n \n cat >expect <<'EOF'\n-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.\n+Your branch is behind 'master' by 1 commit.\n+It can be fast-forwarded.\n   (use \"git pull\" to update your local branch)\n EOF\n test_expect_success 'tracking count is accurate after orphan check' '\ndiff --git a/t/t7508-status.sh b/t/t7508-status.sh\nindex 43d19a9b22920..fd7f27ee01ab0 100755\n--- a/t/t7508-status.sh\n+++ b/t/t7508-status.sh\n@@ -88,8 +88,8 @@ EOF\n test_expect_success 'status --column' '\n \tcat >expect <<\\EOF &&\n # On branch master\n-# Your branch and '\\''upstream'\\'' have diverged,\n-# and have 1 and 2 different commits each, respectively.\n+# Your branch and '\\''upstream'\\'' have diverged.\n+# They have 1 and 2 different commits, respectively.\n #   (use \"git pull\" to merge the remote branch into yours)\n #\n # Changes to be committed:\n@@ -122,8 +122,8 @@ test_expect_success 'status --column status.displayCommentPrefix=false' '\n \n cat >expect <<\\EOF\n # On branch master\n-# Your branch and 'upstream' have diverged,\n-# and have 1 and 2 different commits each, respectively.\n+# Your branch and 'upstream' have diverged.\n+# They have 1 and 2 different commits, respectively.\n #   (use \"git pull\" to merge the remote branch into yours)\n #\n # Changes to be committed:\n@@ -199,8 +199,8 @@ test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_\n \n cat >expect <<\\EOF\n On branch master\n-Your branch and 'upstream' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and 'upstream' have diverged.\n+They have 1 and 2 different commits, respectively.\n \n Changes to be committed:\n \tnew file:   dir2/added\n@@ -272,8 +272,8 @@ test_expect_success 'status with gitignore' '\n \n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -341,8 +341,8 @@ test_expect_success 'status with gitignore (nothing untracked)' '\n \n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -414,8 +414,8 @@ test_expect_success 'setup dir3' '\n test_expect_success 'status -uno' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -444,8 +444,8 @@ test_expect_success 'status (status.showUntrackedFiles no)' '\n test_expect_success 'status -uno (advice.statusHints false)' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n \n Changes to be committed:\n \tnew file:   dir2/added\n@@ -478,8 +478,8 @@ test_expect_success 'status -s (status.showUntrackedFiles no)' '\n test_expect_success 'status -unormal' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -536,8 +536,8 @@ test_expect_success 'status -s (status.showUntrackedFiles normal)' '\n test_expect_success 'status -uall' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -599,8 +599,8 @@ test_expect_success 'status -s (status.showUntrackedFiles all)' '\n test_expect_success 'status with relative paths' '\n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -670,8 +670,8 @@ test_expect_success 'setup unique colors' '\n test_expect_success 'status with color.ui' '\n \tcat >expect <<\\EOF &&\n On branch <GREEN>master<RESET>\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -796,8 +796,8 @@ test_expect_success 'status --porcelain respects -b' '\n test_expect_success 'status without relative paths' '\n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -846,8 +846,8 @@ test_expect_success 'status -s without relative paths' '\n test_expect_success 'dry-run of partial commit excluding new file in index' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -890,8 +890,8 @@ test_expect_success 'setup status submodule summary' '\n test_expect_success 'status submodule summary is disabled by default' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -950,8 +950,8 @@ head=$(cd sm && git rev-parse --short=7 --verify HEAD)\n test_expect_success 'status submodule summary' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1012,8 +1012,8 @@ test_expect_success 'status -s submodule summary' '\n test_expect_success 'status submodule summary (clean submodule): commit' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes not staged for commit:\n@@ -1062,8 +1062,8 @@ test_expect_success 'status -z implies porcelain' '\n test_expect_success 'commit --dry-run submodule summary (--amend)' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1119,8 +1119,8 @@ touch .gitmodules\n test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1231,8 +1231,8 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie\n test_expect_success \"--ignore-submodules=untracked doesn't suppress submodules with modified content\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1291,8 +1291,8 @@ head2=$(cd sm && git commit -q -m \"2nd commit\" foo && git rev-parse --short=7 --\n test_expect_success \"--ignore-submodules=untracked doesn't suppress submodule summary\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1375,8 +1375,8 @@ test_expect_success \".git/config ignore=dirty doesn't suppress submodule summary\n \n cat > expect << EOF\n ; On branch master\n-; Your branch and 'upstream' have diverged,\n-; and have 2 and 2 different commits each, respectively.\n+; Your branch and 'upstream' have diverged.\n+; They have 2 and 2 different commits, respectively.\n ;   (use \"git pull\" to merge the remote branch into yours)\n ;\n ; Changes to be committed:\n@@ -1426,8 +1426,8 @@ test_expect_success \"status (core.commentchar with two chars with submodule summ\n test_expect_success \"--ignore-submodules=all suppresses submodule summary\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes not staged for commit:\n@@ -1454,8 +1454,8 @@ EOF\n test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1577,8 +1577,8 @@ test_expect_success 'git commit --dry-run will show a staged but ignored submodu\n \tgit add sm &&\n \tcat >expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n\n--\nhttps://github.com/git/git/pull/391\n"},{"id":"325271","messageId":"20170730111326.12139-1-kaarticsivaraam91196@gmail.com","threadId":"46473","inReplyTo":"0102015d7f0c9403-16bd1de5-3b6c-4d23-a3fb-75a26c378c62-000000@eu-west-1.amazonses.com","subject":"[PATCH] branch: change the error messages to be more meaningful","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-30T11:13:26Z","receivedAt":"2017-07-30T11:13:17Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"The error messages shown when the branch command is misused\nby supplying it wrong number of parameters wasn't meaningful.\nThat's because it used the the phrase \"too many branches\"\nassuming all parameters to be \"valid\" branch names. It's not\nalways the case as exemplified below,\n\n        $ git branch\n          foo\n        * master\n\n        $ git branch -m foo foo old\n        fatal: too many branches for a rename operation\n\nChange the messages to be more general thus making no assumptions\nabout the \"parameters\".\n\nSigned-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>\n---\n builtin/branch.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex a3bd2262b..59fedf085 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -707,12 +707,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\telse if (argc == 2)\n \t\t\trename_branch(argv[0], argv[1], rename > 1);\n \t\telse\n-\t\t\tdie(_(\"too many branches for a rename operation\"));\n+\t\t\tdie(_(\"too many parameters for a rename operation\"));\n \t} else if (new_upstream) {\n \t\tstruct branch *branch = branch_get(argv[0]);\n \n \t\tif (argc > 1)\n-\t\t\tdie(_(\"too many branches to set new upstream\"));\n+\t\t\tdie(_(\"too many parameters to set new upstream\"));\n \n \t\tif (!branch) {\n \t\t\tif (!argc || !strcmp(argv[0], \"HEAD\"))\n@@ -735,7 +735,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\tstruct strbuf buf = STRBUF_INIT;\n \n \t\tif (argc > 1)\n-\t\t\tdie(_(\"too many branches to unset upstream\"));\n+\t\t\tdie(_(\"too many parameters to unset upstream\"));\n \n \t\tif (!branch) {\n \t\t\tif (!argc || !strcmp(argv[0], \"HEAD\"))\n-- \n2.14.0.rc1.434.g6eded367a\n\n"},{"id":"325272","messageId":"20170730111705.12444-1-kaarticsivaraam91196@gmail.com","threadId":"46473","inReplyTo":"0102015d7f0c9403-16bd1de5-3b6c-4d23-a3fb-75a26c378c62-000000@eu-west-1.amazonses.com","subject":"[PATCH] remote: split and simplify messages","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-30T11:17:05Z","receivedAt":"2017-07-30T11:16:44Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"Splitting a single sentence across multiple lines could\ndegrade readability. Further, long messages are likely\nto be ignored by users.\n\nSplit the sentences and simplify it to improve their readability.\n\nSigned-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>\n---\n remote.c                   | 18 ++++-----\n t/t2020-checkout-detach.sh |  3 +-\n t/t7508-status.sh          | 96 +++++++++++++++++++++++-----------------------\n 3 files changed, 58 insertions(+), 59 deletions(-)\n\ndiff --git a/remote.c b/remote.c\nindex 60d004392..e4e241d5e 100644\n--- a/remote.c\n+++ b/remote.c\n@@ -2093,10 +2093,10 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)\n \t\t\t\t_(\"  (use \\\"git push\\\" to publish your local commits)\\n\"));\n \t} else if (!ours) {\n \t\tstrbuf_addf(sb,\n-\t\t\tQ_(\"Your branch is behind '%s' by %d commit, \"\n-\t\t\t       \"and can be fast-forwarded.\\n\",\n-\t\t\t   \"Your branch is behind '%s' by %d commits, \"\n-\t\t\t       \"and can be fast-forwarded.\\n\",\n+\t\t\tQ_(\"Your branch is behind '%s' by %d commit.\\n\"\n+\t\t\t       \"It can be fast-forwarded.\\n\",\n+\t\t\t   \"Your branch is behind '%s' by %d commits.\\n\"\n+\t\t\t       \"It can be fast-forwarded.\\n\",\n \t\t\t   theirs),\n \t\t\tbase, theirs);\n \t\tif (advice_status_hints)\n@@ -2104,12 +2104,10 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)\n \t\t\t\t_(\"  (use \\\"git pull\\\" to update your local branch)\\n\"));\n \t} else {\n \t\tstrbuf_addf(sb,\n-\t\t\tQ_(\"Your branch and '%s' have diverged,\\n\"\n-\t\t\t       \"and have %d and %d different commit each, \"\n-\t\t\t       \"respectively.\\n\",\n-\t\t\t   \"Your branch and '%s' have diverged,\\n\"\n-\t\t\t       \"and have %d and %d different commits each, \"\n-\t\t\t       \"respectively.\\n\",\n+\t\t\tQ_(\"Your branch and '%s' have diverged.\\n\"\n+\t\t\t       \"They have %d and %d different commit, respectively.\\n\",\n+\t\t\t   \"Your branch and '%s' have diverged.\\n\"\n+\t\t\t       \"They have %d and %d different commits, respectively.\\n\",\n \t\t\t   ours + theirs),\n \t\t\tbase, ours, theirs);\n \t\tif (advice_status_hints)\ndiff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh\nindex fbb4ee9bb..4e1c74c87 100755\n--- a/t/t2020-checkout-detach.sh\n+++ b/t/t2020-checkout-detach.sh\n@@ -150,7 +150,8 @@ test_expect_success 'checkout does not warn leaving reachable commit' '\n '\n \n cat >expect <<'EOF'\n-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.\n+Your branch is behind 'master' by 1 commit.\n+It can be fast-forwarded.\n   (use \"git pull\" to update your local branch)\n EOF\n test_expect_success 'tracking count is accurate after orphan check' '\ndiff --git a/t/t7508-status.sh b/t/t7508-status.sh\nindex 43d19a9b2..fd7f27ee0 100755\n--- a/t/t7508-status.sh\n+++ b/t/t7508-status.sh\n@@ -88,8 +88,8 @@ EOF\n test_expect_success 'status --column' '\n \tcat >expect <<\\EOF &&\n # On branch master\n-# Your branch and '\\''upstream'\\'' have diverged,\n-# and have 1 and 2 different commits each, respectively.\n+# Your branch and '\\''upstream'\\'' have diverged.\n+# They have 1 and 2 different commits, respectively.\n #   (use \"git pull\" to merge the remote branch into yours)\n #\n # Changes to be committed:\n@@ -122,8 +122,8 @@ test_expect_success 'status --column status.displayCommentPrefix=false' '\n \n cat >expect <<\\EOF\n # On branch master\n-# Your branch and 'upstream' have diverged,\n-# and have 1 and 2 different commits each, respectively.\n+# Your branch and 'upstream' have diverged.\n+# They have 1 and 2 different commits, respectively.\n #   (use \"git pull\" to merge the remote branch into yours)\n #\n # Changes to be committed:\n@@ -199,8 +199,8 @@ test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_\n \n cat >expect <<\\EOF\n On branch master\n-Your branch and 'upstream' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and 'upstream' have diverged.\n+They have 1 and 2 different commits, respectively.\n \n Changes to be committed:\n \tnew file:   dir2/added\n@@ -272,8 +272,8 @@ test_expect_success 'status with gitignore' '\n \n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -341,8 +341,8 @@ test_expect_success 'status with gitignore (nothing untracked)' '\n \n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -414,8 +414,8 @@ test_expect_success 'setup dir3' '\n test_expect_success 'status -uno' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -444,8 +444,8 @@ test_expect_success 'status (status.showUntrackedFiles no)' '\n test_expect_success 'status -uno (advice.statusHints false)' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n \n Changes to be committed:\n \tnew file:   dir2/added\n@@ -478,8 +478,8 @@ test_expect_success 'status -s (status.showUntrackedFiles no)' '\n test_expect_success 'status -unormal' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -536,8 +536,8 @@ test_expect_success 'status -s (status.showUntrackedFiles normal)' '\n test_expect_success 'status -uall' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -599,8 +599,8 @@ test_expect_success 'status -s (status.showUntrackedFiles all)' '\n test_expect_success 'status with relative paths' '\n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -670,8 +670,8 @@ test_expect_success 'setup unique colors' '\n test_expect_success 'status with color.ui' '\n \tcat >expect <<\\EOF &&\n On branch <GREEN>master<RESET>\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -796,8 +796,8 @@ test_expect_success 'status --porcelain respects -b' '\n test_expect_success 'status without relative paths' '\n \tcat >expect <<\\EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -846,8 +846,8 @@ test_expect_success 'status -s without relative paths' '\n test_expect_success 'dry-run of partial commit excluding new file in index' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -890,8 +890,8 @@ test_expect_success 'setup status submodule summary' '\n test_expect_success 'status submodule summary is disabled by default' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -950,8 +950,8 @@ head=$(cd sm && git rev-parse --short=7 --verify HEAD)\n test_expect_success 'status submodule summary' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 1 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 1 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1012,8 +1012,8 @@ test_expect_success 'status -s submodule summary' '\n test_expect_success 'status submodule summary (clean submodule): commit' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes not staged for commit:\n@@ -1062,8 +1062,8 @@ test_expect_success 'status -z implies porcelain' '\n test_expect_success 'commit --dry-run submodule summary (--amend)' '\n \tcat >expect <<EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1119,8 +1119,8 @@ touch .gitmodules\n test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1231,8 +1231,8 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie\n test_expect_success \"--ignore-submodules=untracked doesn't suppress submodules with modified content\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1291,8 +1291,8 @@ head2=$(cd sm && git commit -q -m \"2nd commit\" foo && git rev-parse --short=7 --\n test_expect_success \"--ignore-submodules=untracked doesn't suppress submodule summary\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1375,8 +1375,8 @@ test_expect_success \".git/config ignore=dirty doesn't suppress submodule summary\n \n cat > expect << EOF\n ; On branch master\n-; Your branch and 'upstream' have diverged,\n-; and have 2 and 2 different commits each, respectively.\n+; Your branch and 'upstream' have diverged.\n+; They have 2 and 2 different commits, respectively.\n ;   (use \"git pull\" to merge the remote branch into yours)\n ;\n ; Changes to be committed:\n@@ -1426,8 +1426,8 @@ test_expect_success \"status (core.commentchar with two chars with submodule summ\n test_expect_success \"--ignore-submodules=all suppresses submodule summary\" '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes not staged for commit:\n@@ -1454,8 +1454,8 @@ EOF\n test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '\n \tcat > expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n@@ -1577,8 +1577,8 @@ test_expect_success 'git commit --dry-run will show a staged but ignored submodu\n \tgit add sm &&\n \tcat >expect << EOF &&\n On branch master\n-Your branch and '\\''upstream'\\'' have diverged,\n-and have 2 and 2 different commits each, respectively.\n+Your branch and '\\''upstream'\\'' have diverged.\n+They have 2 and 2 different commits, respectively.\n   (use \"git pull\" to merge the remote branch into yours)\n \n Changes to be committed:\n-- \n2.14.0.rc1.434.g6eded367a\n\n"},{"id":"325273","messageId":"1501414648.12254.2.camel@gmail.com","threadId":"46473","inReplyTo":"20170730111326.12139-1-kaarticsivaraam91196@gmail.com","subject":"Wrong thread","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-30T11:37:28Z","receivedAt":"2017-07-30T11:37:03Z","isPatch":false,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"Sorry, sent it to the wrong thread. Please, ignore this patch.\n\n--\nKaartic\n"}]}