Paolo Bonzini <pbonzini@xxxxxxxxxx> writes: > 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. :) Somebody mentioned "claims" was too strong, but I think the smiley strikes a good balance there. > 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. Exactly. As somebody else said, we often call such a branch "side" in the tests, with the (hopefully widely-held) assumption that any development, either new feature or bugfix, would be done on a side branch and then merged to the integration branch. What the test tries to do applies equally to the developer workflow to use a side branch to work on a non feature (like bugfixes), too, but what is written in this patch is good enough, I would say. Thank you to all for commenting. Will queue. > > Reported-by: Till Maas <tmaas@xxxxxxxxxx> > Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > --- > t/t4014-format-patch.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > index 575e079cc2..958c2da56e 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 feature master && > echo "Another line" >>file && > test_tick && > - git commit -am "Slave change #1" && > + git commit -am "Feature branch change #1" && > echo "Yet another line" >>file && > test_tick && > - git commit -am "Slave change #2" && > + git commit -am "Feature branch change #2" && > git checkout -b merger master && > test_tick && > - git merge --no-ff slave && > + git merge --no-ff feature && > git format-patch -3 --stdout >patch && > grep "^From " patch >from && > test_line_count = 3 from
