[PATCH v2] Documentation: specify base point when generating MyFirstContribution patchset

Subsystems: documentation, the rest

STALE1788d

3 messages, 2 authors, 2021-10-16 · open the first message on its own page

[PATCH v2] Documentation: specify base point when generating MyFirstContribution patchset

From: Bagas Sanjaya <hidden>
Date: 2021-10-15 12:25:45

Specifying base point (commit hash) can help reviewers and testers
interested on the patchset. Mention how to record it with `--base`
option to `format-patch`.

Signed-off-by: Bagas Sanjaya <redacted>
---
 Changes since v1 [1]:
     - Rewording (suggested by Junio).
     - Show command to determine base commit hash and pass it to `--base`
       option.

 [1]:
https://lore.kernel.org/git/f25fae40-0313-287b-5482-1c64cbe8cb64@gmail.com/T/#t

 Documentation/MyFirstContribution.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index b20bc8e914..5aaf31cb66 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -937,6 +937,23 @@ but want reviewers to look at what they have so far. You can add this flag with
 Check and make sure that your patches and cover letter template exist in the
 directory you specified - you're nearly ready to send out your review!
 
+It would help those who review and test your patches to specify on what
+commit the patches should be applied to. To do so, use the `--base` option
+when running `format-patch`. The option expects hash of the commit the
+patchset is based on. Since we base `psuh` on top of `master`, the base
+commit hash can be determined by: 
+
+----
+$ git show -s --format="%H" master
+----
+
+The output of command above can be passed to `--base` option. Replace `<base>`
+with your own hash:
+
+----
+$ git format-patch --cover-letter --base=<base> -o psuh/ master..psuh
+----
+
 [[cover-letter]]
 === Preparing Email
 
base-commit: 2bd2f258f4195ac54293a3f45b86457c0bd5fc11
-- 
An old man doll... just what I always wanted! - Clara

Re: [PATCH v2] Documentation: specify base point when generating MyFirstContribution patchset

From: Glen Choo <hidden>
Date: 2021-10-15 17:06:10

Bagas Sanjaya [off-list ref] writes:
quoted hunk
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index b20bc8e914..5aaf31cb66 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -937,6 +937,23 @@ but want reviewers to look at what they have so far. You can add this flag with
 Check and make sure that your patches and cover letter template exist in the
 directory you specified - you're nearly ready to send out your review!
 
+It would help those who review and test your patches to specify on what
+commit the patches should be applied to. To do so, use the `--base` option
+when running `format-patch`. The option expects hash of the commit the
+patchset is based on. Since we base `psuh` on top of `master`, the base
+commit hash can be determined by: 
+
+----
+$ git show -s --format="%H" master
+----
+
+The output of command above can be passed to `--base` option. Replace `<base>`
+with your own hash:
+
+----
+$ git format-patch --cover-letter --base=<base> -o psuh/ master..psuh
+----
+
 [[cover-letter]]
 === Preparing Email
This reads quite awkwardly because a few lines above, we already tell
the reader exactly what commands to run:

  Sending emails with Git is a two-part process; before you can prepare the emails
  themselves, you'll need to prepare the patches. Luckily, this is pretty simple:

  ----
  $ git format-patch --cover-letter -o psuh/ master..psuh
  ----

If we do accept this suggestion (and I am not sure if we should, because
as Junio said, there are strong conventions for determining the branch
point), I think this would be easier to follow if we incorporate it into
the existing instructions. Something like..

  Sending emails with Git is a two-part process; before you can prepare the emails
  themselves, you'll need to prepare the patches. Luckily, this is
  pretty simple. First, we'll get the hash of the commit the patchset is
  based on. We call this commit the 'base'.

  ----
  $ git show -s --format="%H" master
  ----

  Now, we'll generate the patches, passing the hash of the 'base' to the
  --base option.

  ----
  $ git format-patch --cover-letter --base=<base> -o psuh/ master..psuh
  ----

  [...describe --base=<base> the way we describe the other options].

Re: [PATCH v2] Documentation: specify base point when generating MyFirstContribution patchset

From: Bagas Sanjaya <hidden>
Date: 2021-10-16 05:16:40

On 16/10/21 00.06, Glen Choo wrote:
This reads quite awkwardly because a few lines above, we already tell
the reader exactly what commands to run:

   Sending emails with Git is a two-part process; before you can prepare the emails
   themselves, you'll need to prepare the patches. Luckily, this is pretty simple:

   ----
   $ git format-patch --cover-letter -o psuh/ master..psuh
   ----

If we do accept this suggestion (and I am not sure if we should, because
as Junio said, there are strong conventions for determining the branch
point), I think this would be easier to follow if we incorporate it into
the existing instructions. Something like..

   Sending emails with Git is a two-part process; before you can prepare the emails
   themselves, you'll need to prepare the patches. Luckily, this is
   pretty simple. First, we'll get the hash of the commit the patchset is
   based on. We call this commit the 'base'.

   ----
   $ git show -s --format="%H" master
   ----

   Now, we'll generate the patches, passing the hash of the 'base' to the
   --base option.

   ----
   $ git format-patch --cover-letter --base=<base> -o psuh/ master..psuh
   ----

   [...describe --base=<base> the way we describe the other options].
Actually it is up to contributors whether they want to include `--base` 
or not.

-- 
An old man doll... just what I always wanted! - Clara
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help