From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: git@vger.kernel.org, msuchanek@suse.de, Till Maas <tmaas@redhat.com>
Subject: Re: [PATCH v2] tests: do not use "slave branch" nomenclature
Date: Fri, 19 Jun 2020 18:57:54 +0530 [thread overview]
Message-ID: <8f2bf041-1a04-55cb-05fd-a3802fbfb09d@gmail.com> (raw)
In-Reply-To: <20200619093210.31289-1-pbonzini@redhat.com>
On 19-06-2020 15:02, Paolo Bonzini wrote:
> 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. :)
>
I wonder if "claims" is too strong a word here. "... hints otherwise"
sounds better to me.
> 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>
Other than that and the comment by Danh elsewhere this patch looks
good to me.
> ---
> 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
>
--
Sivaraam
next prev parent reply other threads:[~2020-06-19 13:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 9:32 [PATCH v2] tests: do not use "slave branch" nomenclature Paolo Bonzini
2020-06-19 13:00 ` Đoàn Trần Công Danh
2020-06-19 14:23 ` Paolo Bonzini
2020-06-19 13:27 ` Kaartic Sivaraam [this message]
2020-06-19 17:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f2bf041-1a04-55cb-05fd-a3802fbfb09d@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=git@vger.kernel.org \
--cc=msuchanek@suse.de \
--cc=pbonzini@redhat.com \
--cc=tmaas@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).