{"thread":{"id":"53647","subject":"[PATCH] Use sensible titles in t4014","startedAt":"2020-06-10T16:54:47Z","lastAt":"2020-06-10T17:03:16Z","messageCount":2,"participants":["Konstantin Ryabitsev","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"399415","messageId":"20200610165441.iktvzuwz44sbytfg@chatter.i7.local","threadId":"53647","inReplyTo":null,"subject":"[PATCH] Use sensible titles in t4014","fromName":"Konstantin Ryabitsev","fromEmail":"konstantin@linuxfoundation.org","sentAt":"2020-06-10T16:54:41Z","receivedAt":"2020-06-10T16:54:47Z","isPatch":true,"sender":{"key":"konstantin@linuxfoundation.org","avatar":"https://gravatar.com/avatar/7cb8827c6de56e1bd2dea16508c6708aa43feed3bf3813bcdacecdf96ceadd79?d=mp&s=160"},"body":"Switch to \"test\" and \"testbranch\" in order to avoid using divisive \nlanguage.\n\nSigned-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>\n---\n t/t4014-format-patch.sh | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh\nindex 575e079cc2..e6e7995d90 100755\n--- a/t/t4014-format-patch.sh\n+++ b/t/t4014-format-patch.sh\n@@ -81,16 +81,16 @@ test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '\n '\n \n test_expect_success \"format-patch doesn't consider merge commits\" '\n-\tgit checkout -b slave master &&\n+\tgit checkout -b testbranch master &&\n \techo \"Another line\" >>file &&\n \ttest_tick &&\n-\tgit commit -am \"Slave change #1\" &&\n+\tgit commit -am \"Test change #1\" &&\n \techo \"Yet another line\" >>file &&\n \ttest_tick &&\n-\tgit commit -am \"Slave change #2\" &&\n+\tgit commit -am \"Test change #2\" &&\n \tgit checkout -b merger master &&\n \ttest_tick &&\n-\tgit merge --no-ff slave &&\n+\tgit merge --no-ff testbranch &&\n \tgit format-patch -3 --stdout >patch &&\n \tgrep \"^From \" patch >from &&\n \ttest_line_count = 3 from\n\nbase-commit: 0313f36c6ebecb3bffe6f15cf25a4883100f0214\n-- \n2.25.4\n\n"},{"id":"399418","messageId":"xmqqr1umg8fp.fsf@gitster.c.googlers.com","threadId":"53647","inReplyTo":"20200610165441.iktvzuwz44sbytfg@chatter.i7.local","subject":"Re: [PATCH] Use sensible titles in t4014","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-06-10T17:03:06Z","receivedAt":"2020-06-10T17:03:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Konstantin Ryabitsev <konstantin@linuxfoundation.org> writes:\n\n> Switch to \"test\" and \"testbranch\" in order to avoid using divisive \n> language.\n\nIf this were to call the side branch getting merged with the word\nthat literally means that (i.e. call it \"side\", not \"testbranch\",\nand match the log message to say something like \"change made on the\nside branch\"), then you do not even have to mention that this is\nabout \"avoiding\" divisive language but more about using the more\nmeaningful words that are useful in helping readers understand what\nis going on.\n\nYes, I do not necessarily oppose to \"avoid divisive language\" just\nfor the sake of avoiding it, but I do prefer to see changes done\nto use language that conveys our intention better at the same time,\nsince we would be finding different words and phrases anyway.\n\nThanks.\n\n>\n> Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>\n> ---\n>  t/t4014-format-patch.sh | 8 ++++----\n>  1 file changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh\n> index 575e079cc2..e6e7995d90 100755\n> --- a/t/t4014-format-patch.sh\n> +++ b/t/t4014-format-patch.sh\n> @@ -81,16 +81,16 @@ test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '\n>  '\n>  \n>  test_expect_success \"format-patch doesn't consider merge commits\" '\n> -\tgit checkout -b slave master &&\n> +\tgit checkout -b testbranch master &&\n>  \techo \"Another line\" >>file &&\n>  \ttest_tick &&\n> -\tgit commit -am \"Slave change #1\" &&\n> +\tgit commit -am \"Test change #1\" &&\n>  \techo \"Yet another line\" >>file &&\n>  \ttest_tick &&\n> -\tgit commit -am \"Slave change #2\" &&\n> +\tgit commit -am \"Test change #2\" &&\n>  \tgit checkout -b merger master &&\n>  \ttest_tick &&\n> -\tgit merge --no-ff slave &&\n> +\tgit merge --no-ff testbranch &&\n>  \tgit format-patch -3 --stdout >patch &&\n>  \tgrep \"^From \" patch >from &&\n>  \ttest_line_count = 3 from\n>\n> base-commit: 0313f36c6ebecb3bffe6f15cf25a4883100f0214\n"}]}