From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id E5A541F953 for ; Mon, 15 Nov 2021 10:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237626AbhKOKmn (ORCPT ); Mon, 15 Nov 2021 05:42:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237552AbhKOKm3 (ORCPT ); Mon, 15 Nov 2021 05:42:29 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 838E1C061746 for ; Mon, 15 Nov 2021 02:39:33 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id z1-20020a05600c220100b00337f97d2464so740163wml.1 for ; Mon, 15 Nov 2021 02:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=A00f+4Avkag87FIEgaDAFQAtQ2zn7qBXvASz2G74ugc=; b=pMzUAhDrp7tPSqLU9rB3lnOQiJXb7Z3+f39A1xfD+xcYuG59dCliMWl/sr2XkQgDiQ 3Oo1x7zCAUCOTNsAi4NXgliDTiepxZ958lo181xnGgqoMS6BLpiNSnvCRJ+XuP7e36DK sAOX/Lh0EsMhJ2j9SJDF4Ch6KvmsHdfYRS+hmxJR4Z9GydF54bgFO7vBNOidrU+8IrSv 8qhaD34QMDFyfn2K4r5IRQmIRUaLq631IPJDbeg+htzGhiR7GRDz8PCUTeSg9SPQ7z3P 5Cw6klA9ikeBYUfoFNcVHWnCNKKmrTR0JpjJ7Bj9mKaYBsu6qMUWMV860TsTrG4S3QHV tMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=A00f+4Avkag87FIEgaDAFQAtQ2zn7qBXvASz2G74ugc=; b=z+8OL/8FEP0v/0MOfIha603XW9A6XE4I7EbXxc3zVTtBbetRzxYYbda5QbYwKtgNAr XPvzrihOh6QWrEa6U/hZ5W0WdXSBNPOZUGqGOWU623wx9lF8Vt+AOrurCkMW0+ni5Dwo fOzGQQv1zmngjlyAAfCmj4McvzhSlwC285rHvbME15ALYcvxiaFb7QXhPjIXDhHbXEPI trjQUDZsNFtDuMfeEKqXkJpHTn5zaM9Hsu4eqWNcQguCq0CzzocadHUlqXeWijx/ZvoY Jd33AcHD/lAGWIh23w6z1iNqVgUlNMRLk8w1nvUJt/5EasXmFlfKlr09+KiIYQGu/i1r b5CA== X-Gm-Message-State: AOAM5322KrCJE8KSJv+IpYq2HQvG2ojvxycTDiTUbUgPBfC6eCTQ0jEd gy7dQIe3VLwU6/5udbKBIvv0YVw6c18= X-Google-Smtp-Source: ABdhPJyV670+6pDFVCcuWcg56i3Uw333Za8o5ObS60qKuh1wYz1XD1n5y92U5IXhXJtT1JdYS5JLFA== X-Received: by 2002:a1c:4d0b:: with SMTP id o11mr40787908wmh.68.1636972771960; Mon, 15 Nov 2021 02:39:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h15sm21590728wmq.32.2021.11.15.02.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 02:39:31 -0800 (PST) Message-Id: In-Reply-To: References: From: "Aleen via GitGitGadget" Date: Mon, 15 Nov 2021 10:39:29 +0000 Subject: [PATCH v3 2/2] am: support --empty-commit option to handle empty patches Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?UTF-8?Q?Ren=C3=A9?= Scharfe , Aleen =?UTF-8?Q?=E5=BE=90=E6=B2=9B=E6=96=87?= , =?UTF-8?Q?Ren=C3=A9?= Scharfe , Aleen , Aleen Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Aleen Signed-off-by: Aleen --- Documentation/git-am.txt | 9 +++++++ builtin/am.c | 48 +++++++++++++++++++++++++++++---- t/t4150-am.sh | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 5 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 0a4a984dfde..d8d3bf202d7 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -16,6 +16,7 @@ SYNOPSIS [--exclude=] [--include=] [--reject] [-q | --quiet] [--[no-]scissors] [-S[]] [--patch-format=] [--quoted-cr=] + [--empty-commit=(die|skip|asis)] [( | )...] 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) @@ -63,6 +64,14 @@ OPTIONS --quoted-cr=:: This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]). +--empty-commit=(die|skip|asis):: + The command usually errors out when seeing an input e-mail + message that lacks a patch. When this option is set to + 'skip', skip such an e-mail message without outputting error. + When this option is set to 'asis', create an empty commit, + recording the contents of the e-mail message as its log. + 'die' is specified by default. + -m:: --message-id:: Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), diff --git a/builtin/am.c b/builtin/am.c index 8677ea2348a..e7755c1377e 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -87,6 +87,12 @@ enum show_patch_type { SHOW_PATCH_DIFF = 1, }; +enum empty_commit_action { + DIE_EMPTY_COMMIT = 0, /* output errors */ + SKIP_EMPTY_COMMIT, /* skip without outputting errors */ + ASIS_EMPTY_COMMIT /* keep recording as empty commits */ +}; + struct am_state { /* state directory path */ char *dir; @@ -118,6 +124,7 @@ struct am_state { int message_id; int scissors; /* enum scissors_type */ int quoted_cr; /* enum quoted_cr_action */ + int empty_commit; /* enum empty_commit_action */ struct strvec git_apply_opts; const char *resolvemsg; int committer_date_is_author_date; @@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt, return 0; } +static int am_option_parse_empty_commit(const struct option *opt, + const char *arg, int unset) +{ + int *opt_value = opt->value; + + if (unset || !strcmp(arg, "die")) + *opt_value = DIE_EMPTY_COMMIT; + else if (!strcmp(arg, "skip")) + *opt_value = SKIP_EMPTY_COMMIT; + else if (!strcmp(arg, "asis")) + *opt_value = ASIS_EMPTY_COMMIT; + else + return error(_("Invalid value for --empty-commit: %s"), arg); + + return 0; +} + /** * Returns path relative to the am_state directory. */ @@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail) goto finish; } - if (is_empty_or_missing_file(am_path(state, "patch"))) { - printf_ln(_("Patch is empty.")); - die_user_resolve(state); - } - strbuf_addstr(&msg, "\n\n"); strbuf_addbuf(&msg, &mi.log_message); strbuf_stripspace(&msg, 0); @@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume) if (state->interactive && do_interactive(state)) goto next; + if (is_empty_or_missing_file(am_path(state, "patch"))) { + if (state->empty_commit == SKIP_EMPTY_COMMIT) + goto next; + else if (state->empty_commit == ASIS_EMPTY_COMMIT) { + if (run_applypatch_msg_hook(state)) + exit(1); + else + goto commit; + } else if (state->empty_commit == DIE_EMPTY_COMMIT) { + printf_ln(_("Patch is empty.")); + die_user_resolve(state); + } + } + if (run_applypatch_msg_hook(state)) exit(1); @@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume) die_user_resolve(state); } +commit: do_commit(state); next: @@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix) { OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"), N_("GPG-sign commits"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, + { OPTION_CALLBACK, 0, "empty-commit", &state.empty_commit, + "(die|skip|asis)", + N_("specify how to handle empty patches"), + PARSE_OPT_OPTARG, am_option_parse_empty_commit }, OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing, N_("(internal use for git-rebase)")), OPT_END() diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 2aaaa0d7ded..13fdf2f86c6 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -196,6 +196,12 @@ test_expect_success setup ' git format-patch -M --stdout lorem^ >rename-add.patch && + git checkout -b empty-commit && + git commit -m "empty commit" --allow-empty && + + git format-patch --stdout empty-commit^ >empty.patch && + git format-patch --always --stdout empty-commit^ >empty-commit.patch && + # reset time sane_unset test_tick && test_tick @@ -1152,4 +1158,56 @@ test_expect_success 'apply binary blob in partial clone' ' git -C client am ../patch ' +test_expect_success 'still output error with --empty-commit when meeting empty files' ' + test_must_fail git am --empty-commit=skip empty.patch 2>actual && + echo Patch format detection failed. >expected && + test_cmp expected actual +' + +test_expect_success 'error when meeting e-mail message that lacks a patch by default' ' + git checkout empty-commit^ && + test_must_fail git am empty-commit.patch >err && + test_path_is_dir .git/rebase-apply && + test_i18ngrep "Patch is empty." err && + rm -fr .git/rebase-apply && + + test_must_fail git am --empty-commit=die empty-commit.patch >err && + test_path_is_dir .git/rebase-apply && + test_i18ngrep "Patch is empty." err && + rm -fr .git/rebase-apply && + + test_must_fail git am --empty-commit=die cover-letter.patch >err && + test_path_is_dir .git/rebase-apply && + test_i18ngrep "Patch is empty." err && + rm -fr .git/rebase-apply +' + +test_expect_success 'skip without error when meeting e-mail message that lacks a patch' ' + git am --empty-commit=skip empty-commit.patch >err && + test_path_is_missing .git/rebase-apply && + git rev-parse empty-commit^ >expected && + git rev-parse HEAD >actual && + test_cmp expected actual && + + git am --empty-commit=skip cover-letter.patch >err && + test_path_is_missing .git/rebase-apply && + git rev-parse empty-commit^ >expected && + git rev-parse HEAD >actual && + test_cmp expected actual +' + +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' ' + git am --empty-commit=asis empty-commit.patch && + test_path_is_missing .git/rebase-apply && + git show empty-commit --format="%B" >expected && + git show HEAD --format="%B" >actual && + grep -f actual expected && + + git am --empty-commit=asis cover-letter.patch && + test_path_is_missing .git/rebase-apply && + git show empty-commit --format="%B" >expected && + git show HEAD --format="%B" >actual && + grep -f actual expected +' + test_done -- gitgitgadget