From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 08C9D20441 for ; Wed, 28 Dec 2016 18:35:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751809AbcL1SfY (ORCPT ); Wed, 28 Dec 2016 13:35:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52204 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbcL1SfX (ORCPT ); Wed, 28 Dec 2016 13:35:23 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 825A65455E; Wed, 28 Dec 2016 18:35:05 +0000 (UTC) Received: from localhost (ovpn-116-29.gru2.redhat.com [10.97.116.29]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBSIZ4qK028236; Wed, 28 Dec 2016 13:35:04 -0500 From: Eduardo Habkost To: git@vger.kernel.org Cc: Paul Tan , Stefan Beller Subject: [PATCH v2] am: add am.signoff add config variable Date: Wed, 28 Dec 2016 16:35:01 -0200 Message-Id: <20161228183501.15068-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 28 Dec 2016 18:35:05 +0000 (UTC) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org git-am has options to enable --message-id and --3way by default, but no option to enable --signoff by default. Add a "am.signoff" config option. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Added documentation to Documentation/git-am.txt and Documentation/config.txt * Added test cases to t4150-am.sh --- Documentation/config.txt | 5 +++++ Documentation/git-am.txt | 6 ++++-- builtin/am.c | 2 ++ t/t4150-am.sh | 24 ++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 30cb94610..6b2990203 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -822,6 +822,11 @@ am.keepcr:: by giving `--no-keep-cr` from the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]. +am.signoff:: + If true, git-am will add a `Signed-off-by:` line to the commit + message. See the signoff option in linkgit:git-commit[1] for + more information. + am.threeWay:: By default, `git am` will fail if the patch does not apply cleanly. When set to true, this setting tells `git am` to fall back on 3-way merge if diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 12879e402..f22f10d40 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] +'git am' [--[no-]signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=