Skip to contentSkip to conversation

tests: do not use "slave branch" nomenclature

PATCH In review Paolo Bonzini 4 participants 5 messages Jun 18, 2020 – Jun 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: do not use "slave branch" nomenclature

From: Paolo Bonzini <[email protected]>

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.

---
 t/t4014-format-patch.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
t/t4014-format-patch.sh +4 -4
index 575e079cc2..3e5b921b0f 100755
@@ -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
Signature · 1 line
2.25.4
#1 lore raw
Quoted 5 lines · Paolo Bonzini

From: Paolo Bonzini <[email protected]>

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/[email protected]/

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

#2 lore raw
Quoted 8 lines · Jeff King
Quoted 5 lines · Paolo Bonzini

From: Paolo Bonzini <[email protected]>

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.

Quoted 8 lines

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

https://lore.kernel.org/git/[email protected]/

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 ;-).

#3 lore raw
Quoted 13 lines · Junio C Hamano
Quoted 11 lines · Jeff King
Quoted 5 lines · Paolo Bonzini

From: Paolo Bonzini <[email protected]>

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:

Quoted 8 lines
Quoted 5 lines

https://lore.kernel.org/git/[email protected]/

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

#4 lore raw
Quoted 20 lines · Michal Suchánek
Quoted 19 lines · Junio C Hamano
Quoted 16 lines · Jeff King
Quoted 5 lines · Paolo Bonzini

From: Paolo Bonzini <[email protected]>

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/[email protected]/

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).

Quoted 6 lines
Quoted 2 lines

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