From patchwork Sat Nov 26 11:54:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 7897 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A863A27BBED; Sat, 26 Nov 2022 11:55:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F319E27BBE9 for ; Sat, 26 Nov 2022 11:55:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oytm5-0008Nj-23; Sat, 26 Nov 2022 06:55:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oytlw-0008MH-N9 for guix-patches@gnu.org; Sat, 26 Nov 2022 06:55:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oytlw-0000NK-Eb for guix-patches@gnu.org; Sat, 26 Nov 2022 06:55:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oytlv-0006qk-Ax for guix-patches@gnu.org; Sat, 26 Nov 2022 06:55:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59523] [PATCH v2 3/3] doc: contributing: Recommend --base=origin/master. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Nov 2022 11:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59523 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59523@debbugs.gnu.org Cc: "\(" Received: via spool by 59523-submit@debbugs.gnu.org id=B59523.166946367726275 (code B ref 59523); Sat, 26 Nov 2022 11:55:03 +0000 Received: (at 59523) by debbugs.gnu.org; 26 Nov 2022 11:54:37 +0000 Received: from localhost ([127.0.0.1]:38018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oytlV-0006pe-8V for submit@debbugs.gnu.org; Sat, 26 Nov 2022 06:54:37 -0500 Received: from knopi.disroot.org ([178.21.23.139]:53168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oytlS-0006p8-Iz for 59523@debbugs.gnu.org; Sat, 26 Nov 2022 06:54:35 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E5BB6410D5; Sat, 26 Nov 2022 12:54:33 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tAYr-i1p1WwH; Sat, 26 Nov 2022 12:54:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669463672; bh=qeS3UL0WXSyCpUa12IZCdHSX7HCXPsBFfEHXZOdAzBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ize/ZfEU63gDwLIvgGgQ+m9TPsSjRwMoWnKsZnjFthtTBqRpOGEqiV63wKxW7knyR AqH2QqRWX+oN/1pPeSGigr9gonwOaJzowDuU0ZFDtGGPmxPTZaJhE6PcUwVJ01oHdJ hpmUUpS25/x4FEXmz13HXKa4/8QvZsymnmDKtzckA/s0l9V5W4MxnMyPp7LCz3RxTn N8RMimiG5k7BCJPzsrEd1YRKbtT/9z2IohxUAhYWfFLBmd2bUhEuPVkUyHH2GlwgDn +0A2m8evR6p9cPgq+yaq4eu0Wryg5peCZE8qUBeP27DWQHI71eZZSdJpBhfKONrIjE BGtDkkgocrkkA== Date: Sat, 26 Nov 2022 11:54:26 +0000 Message-Id: <20221126115426.7385-3-paren@disroot.org> In-Reply-To: <20221126115426.7385-1-paren@disroot.org> References: <20221126115426.7385-1-paren@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/contributing.texi ("Submitting Patches") ["Sending a Patch Series"]: Recommend --base=origin/master instead of --base=auto. --- doc/contributing.texi | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index d2c1d69f69..edbdf2fded 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1428,7 +1428,8 @@ open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to the Guix mailing list to be reviewed and merged: @example -$ git send-email -1 -a --base=auto --to=guix-patches@@gnu.org +$ git send-email -1 -a --base=origin/master \ + --to=guix-patches@@gnu.org @end example @quotation Tip @@ -1439,7 +1440,7 @@ other than the @code{master} branch of @url{https://git.savannah.gnu.org/cgit/guix.git}. @example -git send-email -1 -a --base=auto \ +git send-email -1 -a --base=origin/master \ --subject-prefix='PATCH core-updates' \ --to=guix-patches@@gnu.org @end example @@ -1450,9 +1451,11 @@ message. You may ``annotate'' the patch with explanatory text by adding it under this line. If you do not wish to annotate the email, you may drop the @option{-a} flag (which is short for @option{--annotate}). -The @option{--base=auto} flag automatically adds a note at the bottom -of the patch of the commit it was based on, making it easier for -maintainers to rebase and merge your patch. +The @option{--base=origin/master} flag automatically adds a note at the +bottom of the patch of the commit hash of @code{origin/master}, making it +easier for maintainers to rebase and merge your patch. Of course, if +your patchset is based on, say, @code{core-updates}, you need to use +@option{--base=origin/core-updates}. If you need to send a revised patch, don't resend it like this or send a ``fix'' patch to be applied on top of the last one; instead, use @@ -1462,7 +1465,7 @@ address and the @option{-v} flag with @command{git send-email}. @example $ git commit -a -$ git send-email -1 -a --base=auto -v@var{REVISION} \ +$ git send-email -1 -a --base=origin/master -v@var{REVISION} \ --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org @end example @@ -1506,7 +1509,7 @@ with @command{git format-patch}. @example $ git format-patch -@var{NUMBER_COMMITS} -o outgoing \ - --cover-letter --base=auto + --cover-letter --base=origin/master @end example We can now send @emph{just} the cover letter to the @@ -1540,7 +1543,7 @@ the patchset. @example $ git send-email -@var{NUMBER_COMMITS} \ - -v@var{REVISION} --base=auto \ + -v@var{REVISION} --base=origin/master \ --to @var{ISSUE_NUMBER}@@debbugs.gnu.org @end example