tests: do not use "slave branch" nomenclature

Commit Message

Paolo Bonzini June 18, 2020, 4:38 p.m. UTC

From: Paolo Bonzini <[e-mail]>

Git does not have slave branches and has never had.  Independent
of any future change to the naming of branches, remove the sole
appearance of the term.

Signed-off-by: Paolo Bonzini <[e-mail]>
---
 t/t4014-format-patch.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Jeff King June 18, 2020, 4:45 p.m. UTC | #1

On Thu, Jun 18, 2020 at 06:38:43PM +0200, Paolo Bonzini wrote:

> From: Paolo Bonzini <[e-mail]>
> 
> Git does not have slave branches and has never had.  Independent
> of any future change to the naming of branches, remove the sole
> appearance of the term.

I think this is a sensible change, though note that something simpler
was proposed recently:

  https://lore.kernel.org/git/[e-mail]/

and the review suggested using a name that is even more meaningful to
the test case (so we not just remove the unwanted names, but make the
test easier to follow).

-Peff

Junio C Hamano June 18, 2020, 6:08 p.m. UTC | #2

Jeff King <[e-mail]> writes:

> On Thu, Jun 18, 2020 at 06:38:43PM +0200, Paolo Bonzini wrote:
>
>> From: Paolo Bonzini <[e-mail]>
>> 
>> Git does not have slave branches and has never had.  Independent
>> of any future change to the naming of branches, remove the sole
>> appearance of the term.
>
> I think this is a sensible change, though note that something simpler
> was proposed recently:
>
>   https://lore.kernel.org/git/[e-mail]/
>
> and the review suggested using a name that is even more meaningful to
> the test case (so we not just remove the unwanted names, but make the
> test easier to follow).

Thanks for spotting that both versions share the same issue.  We'd
just need a single one that is fixed up ;-).

Michal Suchánek June 19, 2020, 9:20 a.m. UTC | #3

On Thu, Jun 18, 2020 at 11:08:01AM -0700, Junio C Hamano wrote:
> Jeff King <[e-mail]> writes:
> 
> > On Thu, Jun 18, 2020 at 06:38:43PM +0200, Paolo Bonzini wrote:
> >
> >> From: Paolo Bonzini <[e-mail]>
> >> 
> >> Git does not have slave branches and has never had.  Independent
> >> of any future change to the naming of branches, remove the sole
> >> appearance of the term.
> >
> > I think this is a sensible change, though note that something simpler
> > was proposed recently:
> >
> >   https://lore.kernel.org/git/[e-mail]/
> >
> > and the review suggested using a name that is even more meaningful to
> > the test case (so we not just remove the unwanted names, but make the
> > test easier to follow).
> 
> Thanks for spotting that both versions share the same issue.  We'd
> just need a single one that is fixed up ;-).
How about s/slave/feature/

This is about simulating some development happening on the new branch so
this name looks appropriate.

Thanks

Michal

Paolo Bonzini June 19, 2020, 9:23 a.m. UTC | #4

On 19/06/20 11:20, Michal Suchánek wrote:
> On Thu, Jun 18, 2020 at 11:08:01AM -0700, Junio C Hamano wrote:
>> Jeff King <[e-mail]> writes:
>>
>>> On Thu, Jun 18, 2020 at 06:38:43PM +0200, Paolo Bonzini wrote:
>>>
>>>> From: Paolo Bonzini <[e-mail]>
>>>>
>>>> Git does not have slave branches and has never had.  Independent
>>>> of any future change to the naming of branches, remove the sole
>>>> appearance of the term.
>>>
>>> I think this is a sensible change, though note that something simpler
>>> was proposed recently:
>>>
>>>   https://lore.kernel.org/git/[e-mail]/
>>>
>>> and the review suggested using a name that is even more meaningful to
>>> the test case (so we not just remove the unwanted names, but make the
>>> test easier to follow).
>>
>> Thanks for spotting that both versions share the same issue.  We'd
>> just need a single one that is fixed up ;-).
> How about s/slave/feature/
> 
> This is about simulating some development happening on the new branch so
> this name looks appropriate.

Indeed I was going to send v2 with topic or feature.  Thanks,

Paolo

Patch

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 575e079cc2..3e5b921b0f 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -81,16 +81,16 @@  test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
 '
 
 test_expect_success "format-patch doesn't consider merge commits" '
-	git checkout -b slave master &&
+	git checkout -b branch master &&
 	echo "Another line" >>file &&
 	test_tick &&
-	git commit -am "Slave change #1" &&
+	git commit -am "Branch change #1" &&
 	echo "Yet another line" >>file &&
 	test_tick &&
-	git commit -am "Slave change #2" &&
+	git commit -am "Branch change #2" &&
 	git checkout -b merger master &&
 	test_tick &&
-	git merge --no-ff slave &&
+	git merge --no-ff branch &&
 	git format-patch -3 --stdout >patch &&
 	grep "^From " patch >from &&
 	test_line_count = 3 from