t4014: do not use "slave branch" nomenclature

Git branches have been qualified as topic branches, integration branches, development branches, feature branches, release branches and so on. Git has a branch that is the master *for* development, but it is not the master *of* any "slave branch": Git does not have slave branches, and has never had, except for a single testcase that claims otherwise. :) Independent of any future change to the naming of the "master" branch, removing this sole appearance of the term is a strict improvement: it avoids divisive language, and talking about "feature branch" clarifies which developer workflow the test is trying to emulate. Reported-by: Till Maas <tmaas@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Paolo Bonzini committed Jun 19, 2020 at 11:32 UTC 08dc26061f3ff9ee79e6cfda88f0c825b8730e54

1 file changed +4 -4

t/t4014-format-patch.sh

+4 -4

@@ -81,16 +81,16 @@ test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '

81 '

83 test_expect_success "format-patch doesn't consider merge commits" '

84 - git checkout -b slave master &&

84 + git checkout -b feature master &&

85 echo "Another line" >>file &&

86 test_tick &&

87 - git commit -am "Slave change #1" &&

87 + git commit -am "Feature branch change #1" &&

88 echo "Yet another line" >>file &&

89 test_tick &&

90 - git commit -am "Slave change #2" &&

90 + git commit -am "Feature branch change #2" &&

91 git checkout -b merger master &&

92 test_tick &&

93 - git merge --no-ff slave &&

93 + git merge --no-ff feature &&

94 git format-patch -3 --stdout >patch &&

95 grep "^From " patch >from &&

96 test_line_count = 3 from