From: Junio C Hamano <gitster@pobox.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: git@vger.kernel.org, Glen Choo <chooglen@google.com>,
Carlo Arenas <carenas@gmail.com>
Subject: Re: [PATCH] Documentation: specify base point when generating MyFirstContribution patchset
Date: Wed, 13 Oct 2021 13:30:47 -0700 [thread overview]
Message-ID: <xmqq1r4ofz0o.fsf@gitster.g> (raw)
In-Reply-To: 20211013122234.448845-1-bagasdotme@gmail.com
Bagas Sanjaya <bagasdotme@gmail.com> writes:
> +Some reviewers (notably testers) would like to know at what point your patchset
> +are based on (in particular to apply the patchset). In such cases, you can
> +mention the base point when preparing your email (see below section), or by
> +passing `--base=$(git merge-base master psuh)` to `format-patch`. If no base
> +point is specified, the patchset is assumed to be applied on top of current
> +tip of `master` branch.
This document is about contributing to _this_ project, so I think we
can and should be more explicit to say what is preferred, not "some
would like to know, and in such a case you give this extra piece",
as by definition, somebody who is making their first contribution
would not know whether the reviewer who looks at your work is among
these "some" or not.
It would help those who review and test your patches to make it
clear on what commit they are meant to apply. To do so, use the
"--base" option to record the commit on which you based the
series when running "git format-patch".
If no base is given, what is assumed by default various by
recipient, so all we could say is "If no base is specified, nothing
is assumed", but let's rather not say anything to confuse the
readers.
We could say what we want to see the first-time contributors do,
but I do not think it is needed in this case.
Side note. We want a new feature to be built on 'master' (or
the last feature release, if nothing in flight conflicts
with it)), and a bugfix to be built on one of the older
release point (to be applicable to the maintenance tracks).
But the section we are discussing, i.e. how to run
format-patch, is not the place to do so, as it is too
late---it must be decided before the contributor starts
working on the series. As the example of this document is
about adding a new "feature", we should have a sentence to
explain, in the "Set up your workspace" section, why we
chose 'master' as the base point (and the existing text
already says why).
Thanks.
next prev parent reply other threads:[~2021-10-13 20:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 12:22 [PATCH] Documentation: specify base point when generating MyFirstContribution patchset Bagas Sanjaya
2021-10-13 20:30 ` Junio C Hamano [this message]
2021-10-15 6:51 ` Bagas Sanjaya
2021-10-15 16:26 ` 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=xmqq1r4ofz0o.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=bagasdotme@gmail.com \
--cc=carenas@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
/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).