From patchwork Wed Nov 27 18:13:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 11264679 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E8FC2138C for ; Wed, 27 Nov 2019 18:13:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8E5B20835 for ; Wed, 27 Nov 2019 18:13:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fvYV3ntR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727138AbfK0SNu (ORCPT ); Wed, 27 Nov 2019 13:13:50 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:42031 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726576AbfK0SNt (ORCPT ); Wed, 27 Nov 2019 13:13:49 -0500 Received: by mail-pg1-f193.google.com with SMTP id i5so3002606pgj.9 for ; Wed, 27 Nov 2019 10:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=WduSD2IPzjEU0/WgYXmAZ9p6BxEYXVae+cF+2ORr6kg=; b=fvYV3ntRfLm0hWeqiijF7YigygMcy9CLVKrL1Rf2L0/Gwko4VTl6DqZIpKNz6jzutn 7m0gTbO8eWUDLft2ZRMvZZLDFPxLE275uabYWkySlUlDyLdep0L+LS5kEovGAq+F2Pja 9Ta7c2QCw4D9nrSQJezfpVQUuc8Uj4ml3AdiJPlqfi+12oV+iQg6zGd3T9SzEuiloOqp jB/R3mtlkHWjhEfTGd8N0TacA0QTHt/nIyCko43+JQwI4eo0nw2O4I13jEMb0bMbESFS tT0gG/TYi6+y+oPHXvoH+Sp0JyzF0SR57ZDMTMdvoEeNkpjWe0plVrb1wEbzBqlw0SOw gB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=WduSD2IPzjEU0/WgYXmAZ9p6BxEYXVae+cF+2ORr6kg=; b=UvY5ZzJEisTmeaYLqNTyCBRWi7uhLp5PRXcuE4q6NiUsc/CMjESOULAO+g3V4fQ2oM Ar3G+K6wxhaTzI/lJYrniuqIOUUjLuk+daq/XEPC/0KWY4goKGMNrTHhNeXUISMBuqzK 3B3POY4PSEkZ9WYQPThqETQkQnKRLrKGWipd7LSqWa8zdNLspHKGS2PrDpuMlFP4JCO0 4sGQ704zgTHDE5bevYfdBBZP/KYeADtYL5qCXKjbIcE2N6HalYbIUdtRtq1JZxK4F77E yglr4UyW0R2jatbeZCPp/ofrNtgQQhHPmV1dTW1YmQaIg2DwKYXTEOKDNRMBsAVORSFP HTcg== X-Gm-Message-State: APjAAAX5iAn2nB9i9kBnuCXmXTHXApsE/PPyvoiTmJ4AGjcZZwnsSF0R l38qRonljfMpGRNWBg4j/Pjt4tva X-Google-Smtp-Source: APXvYqwTXd/Rinpc+8ONTdb0/a4eqpaHIM/26kjVQpXGz8SCIp64Z5GNiy2/hOFxv74YbU+qaLMAqw== X-Received: by 2002:a63:ed4a:: with SMTP id m10mr6448878pgk.255.1574878428738; Wed, 27 Nov 2019 10:13:48 -0800 (PST) Received: from generichostname ([204.14.239.138]) by smtp.gmail.com with ESMTPSA id p18sm17713222pff.9.2019.11.27.10.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:13:48 -0800 (PST) Date: Wed, 27 Nov 2019 10:13:46 -0800 From: Denton Liu To: Git Mailing List Cc: Christian Biesinger , Eric Sunshine Subject: [PATCH v2 4/5] format-patch: teach --no-base Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.2 (2019-09-21) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If `format.useAutoBase = true`, there was no way to override this from the command-line. Teach format-patch the `--no-base` option which overrides `format.useAutoBase`. Signed-off-by: Denton Liu --- Documentation/git-format-patch.txt | 5 +++-- builtin/log.c | 24 +++++++++++++++++++++--- t/t4014-format-patch.sh | 6 ++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 00bdf9b125..0d4f8951bb 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -333,11 +333,12 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`. Output an all-zero hash in each patch's From header instead of the hash of the commit. ---base=:: +--[no-]base[=]:: Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If is "auto", a base commit is - automatically chosen. + automatically chosen. The `--no-base` option overrides a + `format.useAutoBase` configuration. --root:: Treat the revision argument as a , even if it diff --git a/builtin/log.c b/builtin/log.c index 9c44682f61..c017df4056 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1388,6 +1388,23 @@ static int from_callback(const struct option *opt, const char *arg, int unset) return 0; } +static int base_callback(const struct option *opt, const char *arg, int unset) +{ + char **base_commit = opt->value; + + free(*base_commit); + + if (unset) { + base_auto = 0; + *base_commit = NULL; + } else if (arg) { + *base_commit = xstrdup(arg); + } else { + BUG("arg is NULL"); + } + return 0; +} + struct base_tree_info { struct object_id base_commit; int nr_patch_id, alloc_patch_id; @@ -1676,10 +1693,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) PARSE_OPT_OPTARG, thread_callback }, OPT_STRING(0, "signature", &signature, N_("signature"), N_("add a signature")), - OPT_STRING(0, "base", &base_commit, N_("base-commit"), - N_("add prerequisite tree info to the patch series")), + { OPTION_CALLBACK, 0, "base", &base_commit, N_("base-commit"), + N_("add prerequisite tree info to the patch series"), + 0, base_callback }, OPT_FILENAME(0, "signature-file", &signature_file, - N_("add a signature from a file")), + N_("add a signature from a file")), OPT__QUIET(&quiet, N_("don't print the patch filenames")), OPT_BOOL(0, "progress", &show_progress, N_("show progress while generating patches")), diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index c7cc643adf..a5b6302a1c 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1958,6 +1958,12 @@ test_expect_success 'format-patch --base overrides format.useAutoBase' ' test_cmp expect actual ' +test_expect_success 'format-patch --no-base overrides format.useAutoBase' ' + test_config format.useAutoBase true && + git format-patch --stdout --no-base -1 >patch && + ! grep "^base-commit:" patch +' + test_expect_success 'format-patch --base with --attach' ' git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch && sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \