From patchwork Tue Dec  7 05:01:33 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=
 <aleen42@vip.qq.com>
X-Patchwork-Id: 12661023
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 7802AC433F5
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 05:01:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229610AbhLGFFK (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 00:05:10 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52652 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229563AbhLGFFJ (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 00:05:09 -0500
Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com
 [IPv6:2a00:1450:4864:20::32d])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5349C061746
        for <git@vger.kernel.org>; Mon,  6 Dec 2021 21:01:39 -0800 (PST)
Received: by mail-wm1-x32d.google.com with SMTP id
 d72-20020a1c1d4b000000b00331140f3dc8so1323709wmd.1
        for <git@vger.kernel.org>; Mon, 06 Dec 2021 21:01:39 -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:mime-version
         :content-transfer-encoding:fcc:to:cc;
        bh=2wOIUyXvK6HBA37YvvgtpeXS/BCdUCODvPh5e+IWqzE=;
        b=R+YX1gSVjBYvymSF6Hpq7K3I4/2RIQFZUHZn4RnbAApaShdWBo+L4hP1QQRw/XVpGY
         xgTkiEPEOpynn90pCmSCKmIA7BEVRgZnU2f8jld9zc0ArFsF510as8vBD7V7OxGAa+90
         4krslQgHq+xQHZYsu+oj9tdGJdNFBBUUdecaWEzFVE9qouu/gy/ZE0Z4SAnLQasOLUqS
         k+fDCGqkjWGKFToPmGNy0NwJ9MyuygH/jYA6Dz+N+m2IQ6a7KPvlDNWw7AqJ36k5sql2
         hbRFuCt7B9a1UdQX54vw1gk3UgeN/ypIplCEi70FUp3zNHNx6IAr71lP04ByMuWaey7k
         ukrA==
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:mime-version:content-transfer-encoding:fcc:to:cc;
        bh=2wOIUyXvK6HBA37YvvgtpeXS/BCdUCODvPh5e+IWqzE=;
        b=TdRViH5UFRGYQ030PnCiK9LjIuLV9bKTgo33M0eYCB1W+HQVTSkELTIGOkwwWd8sUR
         Ej1v84HyUEG3Mz82bHFfPNf3WVl280cR5vZTvyqEvIBFP3B5NAI5YYiSmwm+7n+xgCGs
         LXzSW57y+Ynqo5h5yx2iv5vR+liOwfe8G7rz6jqvw0RTfatrkwKSuMTBP6VMEYJJqoOH
         rD/eKReE92Jr53M8o+Ydq1P0MX34akmknM5Z+MEIuHM14zEGCJL8a+w7Q47NW71G/Npo
         SsUX8eWZfBlYYo1WD2VtuW7GKy4NoLo8BAmXQXca5zPK021V/FPnfV3awt+cn+pIew2U
         pQ+A==
X-Gm-Message-State: AOAM531E++tz7T/iRnIP8gNtyHs17uB07U0nzDFvwxsMmPFAW2bp8cDQ
        DT2/jpXluSO4G+/+gsvIXpJLVHJCk1U=
X-Google-Smtp-Source: 
 ABdhPJzVr4Kk19seyf9etc1qEmk0wP3nm3C6QaCp6UgHQ76KiSYWBYWTpKtDwKXUmD6Aw7hWxdOn2Q==
X-Received: by 2002:a1c:448b:: with SMTP id r133mr4013033wma.85.1638853298255;
        Mon, 06 Dec 2021 21:01:38 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 x13sm13608215wrr.47.2021.12.06.21.01.37
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 06 Dec 2021 21:01:37 -0800 (PST)
Message-Id: 
 <a524ca6adfa2adc02e517b7be5199b0c071134c4.1638853296.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
References: <pull.1076.v15.git.1638783690.gitgitgadget@gmail.com>
        <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 05:01:33 +0000
Subject: [PATCH v16 1/3] doc: git-format-patch: describe the option --always
MIME-Version: 1.0
Fcc: Sent
To: git@vger.kernel.org
Cc: =?utf-8?b?UmVuw6k=?= Scharfe <l.s.r@web.de>,
 Phillip Wood <phillip.wood123@gmail.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Elijah Newren <newren@gmail.com>,
 Aleen =?utf-8?b?5b6Q5rKb5paH?= <pwxu@coremail.cn>,
 Aleen <aleen42@vip.qq.com>,
 =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=  <aleen42@vip.qq.com>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?= <aleen42@vip.qq.com>

From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
 <aleen42@vip.qq.com>

This commit has described how to use '--always' option in the command
'git-format-patch' to include patches for commits that emit no changes.

Signed-off-by: 徐沛文 (Aleen) <aleen42@vip.qq.com>
---
 Documentation/git-format-patch.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 113eabc107c..be797d7a28f 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
-		   [--ignore-if-in-upstream]
+		   [--ignore-if-in-upstream] [--always]
 		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
+--always::
+	Include patches for commits that do not introduce any change,
+	which are omitted by default.
+
 --cover-from-description=<mode>::
 	Controls which parts of the cover letter will be automatically
 	populated using the branch's description.

From patchwork Tue Dec  7 05:01:34 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=
 <aleen42@vip.qq.com>
X-Patchwork-Id: 12661025
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 883BBC433FE
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 05:01:44 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229687AbhLGFFL (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 00:05:11 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52654 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229455AbhLGFFK (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 00:05:10 -0500
Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com
 [IPv6:2a00:1450:4864:20::32c])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DF44C061746
        for <git@vger.kernel.org>; Mon,  6 Dec 2021 21:01:40 -0800 (PST)
Received: by mail-wm1-x32c.google.com with SMTP id 137so9775596wma.1
        for <git@vger.kernel.org>; Mon, 06 Dec 2021 21:01:40 -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:mime-version
         :content-transfer-encoding:fcc:to:cc;
        bh=YZo0hLpe1XHitCHL2lO3PX5kJ4h4BAI4tahVKXjrVtk=;
        b=MEshfFNWSxSHgWN9gXiVuMtCJJ0pNEx4xwXhElZtdfoT20z1UP9CjqAvOVn1PbHqZ0
         4jrZVWMkHVB987ig0U+X/tt/5G870zXuXpbqSo2Myi6Svm3/V0AvLjX/5gky8mMw4bst
         uL36+DkPfn1f+Ct9FPg+9jLwPc2n9v8wEVLWa7vbjkL1rCz7hPIdYGcb9gLAMC6r7U41
         Eqr+uiMerQrQBtZfRwdjvGLqhcDJWTdQF1b1o27TOZWvFkVu3/chw846DrT4Aiam00R9
         zEt+KYZz/5t1KZaqE1NewM6IXA7X/10iv8ndcJILH/U4Npar9WkRq/PQijByEdUJgSzW
         soKg==
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:mime-version:content-transfer-encoding:fcc:to:cc;
        bh=YZo0hLpe1XHitCHL2lO3PX5kJ4h4BAI4tahVKXjrVtk=;
        b=upuqjOwzNRRVx1OfWkT37YeXoE1XtLumBPr3H7U+qvB88qQYMrSbaiIy+Xds0NOHEe
         cRAlGssiOwhWYj++qOUu/PDYJL6J/ua93EFJ1vPexmsMGfz9LW6lhOc9+hiTRJBgMreH
         BNnVOoqmODdLzjwkNVW8YLtVp+p2GXuCLC4u6V+T7BexnWLQUUydCXAYs6sDPb46vvI/
         kFGBQMX0qB0tH2nQqzRcVtx8n2c22ougk02Zxn1ZwbEXR73kw3vBEb7J9RENvsQZA0CI
         daDRasMm/Z4PEVphd+zNNnp3ojZ5EiUIVGI0yCun7GIa0Ig9koW0fasGAbgEo6enenwL
         3SBw==
X-Gm-Message-State: AOAM53269md4XzyLTckLau4sQVNp3AuYyR5r1vP0BCGQI2Y329kuhAu+
        JpEcnVp+rZfwMpoQ1jufOXYJzDAAg4w=
X-Google-Smtp-Source: 
 ABdhPJyI5qxFc+ZXpGz+0T/TDkOl9zVcXqje7s0Mv0C2qs06ep2mHwlvrQ8qNqJkz26VmQzdC8joWA==
X-Received: by 2002:a05:600c:2948:: with SMTP id
 n8mr3941678wmd.170.1638853298916;
        Mon, 06 Dec 2021 21:01:38 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 s63sm1355515wme.22.2021.12.06.21.01.38
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 06 Dec 2021 21:01:38 -0800 (PST)
Message-Id: 
 <b9e03f2342b3fc52515f063f28b34ad9e1dc338a.1638853296.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
References: <pull.1076.v15.git.1638783690.gitgitgadget@gmail.com>
        <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 05:01:34 +0000
Subject: [PATCH v16 2/3] am: support --empty=<option> to handle empty patches
MIME-Version: 1.0
Fcc: Sent
To: git@vger.kernel.org
Cc: =?utf-8?b?UmVuw6k=?= Scharfe <l.s.r@web.de>,
 Phillip Wood <phillip.wood123@gmail.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Elijah Newren <newren@gmail.com>,
 Aleen =?utf-8?b?5b6Q5rKb5paH?= <pwxu@coremail.cn>,
 Aleen <aleen42@vip.qq.com>,
 =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=  <aleen42@vip.qq.com>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?= <aleen42@vip.qq.com>

From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
 <aleen42@vip.qq.com>

Since that the command 'git-format-patch' can include patches of
commits that emit no changes, the 'git-am' command should also
support an option, named as '--empty', to specify how to handle
those empty patches. In this commit, we have implemented three
valid options ('stop', 'drop' and 'keep').

Signed-off-by: 徐沛文 (Aleen) <aleen42@vip.qq.com>
---
 Documentation/git-am.txt |  9 +++++++
 builtin/am.c             | 55 ++++++++++++++++++++++++++++++++++++----
 t/t4150-am.sh            | 49 +++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 0a4a984dfde..7676bd58ae7 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,6 +16,7 @@ SYNOPSIS
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [--quoted-cr=<action>]
+	 [--empty=(stop|drop|keep)]
 	 [(<mbox> | <Maildir>)...]
 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
@@ -63,6 +64,14 @@ OPTIONS
 --quoted-cr=<action>::
 	This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 
+--empty=(stop|drop|keep)::
+	By default, or when the option is set to 'stop', the command
+	errors out on an input e-mail message lacking a patch
+	and stops into the middle of the current am session. When this
+	option is set to 'drop', skip such an e-mail message instead.
+	When this option is set to 'keep', create an empty commit,
+	recording the contents of the e-mail message as its log.
+
 -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..f45aa33366f 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -87,6 +87,12 @@ enum show_patch_type {
 	SHOW_PATCH_DIFF = 1,
 };
 
+enum empty_action {
+	STOP_ON_EMPTY_COMMIT = 0,  /* output errors and stop in the middle of an am session */
+	DROP_EMPTY_COMMIT,         /* skip with a notice message, unless "--quiet" has been passed */
+	KEEP_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_type; /* enum empty_action */
 	struct strvec git_apply_opts;
 	const char *resolvemsg;
 	int committer_date_is_author_date;
@@ -178,6 +185,25 @@ static int am_option_parse_quoted_cr(const struct option *opt,
 	return 0;
 }
 
+static int am_option_parse_empty(const struct option *opt,
+				     const char *arg, int unset)
+{
+	int *opt_value = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+
+	if (!strcmp(arg, "stop"))
+		*opt_value = STOP_ON_EMPTY_COMMIT;
+	else if (!strcmp(arg, "drop"))
+		*opt_value = DROP_EMPTY_COMMIT;
+	else if (!strcmp(arg, "keep"))
+		*opt_value = KEEP_EMPTY_COMMIT;
+	else
+		return error(_("Invalid value for --empty: %s"), arg);
+
+	return 0;
+}
+
 /**
  * Returns path relative to the am_state directory.
  */
@@ -1248,11 +1274,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);
@@ -1763,6 +1784,7 @@ static void am_run(struct am_state *state, int resume)
 	while (state->cur <= state->last) {
 		const char *mail = am_path(state, msgnum(state));
 		int apply_status;
+		int to_keep;
 
 		reset_ident_date();
 
@@ -1792,8 +1814,27 @@ static void am_run(struct am_state *state, int resume)
 		if (state->interactive && do_interactive(state))
 			goto next;
 
+		to_keep = 0;
+		if (is_empty_or_missing_file(am_path(state, "patch"))) {
+			switch (state->empty_type) {
+			case DROP_EMPTY_COMMIT:
+				say(state, stdout, _("Skipping: %.*s"), linelen(state->msg), state->msg);
+				goto next;
+				break;
+			case KEEP_EMPTY_COMMIT:
+				to_keep = 1;
+				break;
+			case STOP_ON_EMPTY_COMMIT:
+				printf_ln(_("Patch is empty."));
+				die_user_resolve(state);
+				break;
+			}
+		}
+
 		if (run_applypatch_msg_hook(state))
 			exit(1);
+		if (to_keep)
+			goto commit;
 
 		say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
 
@@ -1827,6 +1868,7 @@ static void am_run(struct am_state *state, int resume)
 			die_user_resolve(state);
 		}
 
+commit:
 		do_commit(state);
 
 next:
@@ -2357,6 +2399,9 @@ 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) "" },
+		OPT_CALLBACK_F(STOP_ON_EMPTY_COMMIT, "empty", &state.empty_type, "{stop,drop,keep}",
+		  N_("how to handle empty patches"),
+		  PARSE_OPT_NONEG, am_option_parse_empty),
 		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..ce8e8e79ace 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 &&
+
+	: >empty.patch &&
+	git format-patch --always --stdout empty-commit^ >empty-commit.patch &&
+
 	# reset time
 	sane_unset test_tick &&
 	test_tick
@@ -1152,4 +1158,47 @@ test_expect_success 'apply binary blob in partial clone' '
 	git -C client am ../patch
 '
 
+test_expect_success 'an empty input file is error regardless of --empty option' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=drop empty.patch 2>actual &&
+	echo "Patch format detection failed." >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'invalid when passing the --empty option alone' '
+	test_when_finished "git am --abort || :" &&
+	git checkout empty-commit^ &&
+	test_must_fail git am --empty empty-commit.patch 2>err &&
+	echo "error: Invalid value for --empty: empty-commit.patch" >expected &&
+	test_cmp expected err
+'
+
+test_expect_success 'a message without a patch is an error (default)' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty" err
+'
+
+test_expect_success 'a message without a patch is an error where an explicit "--empty=stop" is given' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=stop empty-commit.patch >err &&
+	grep "Patch is empty." err
+'
+
+test_expect_success 'a message without a patch will be skipped when "--empty=drop" is given' '
+	git am --empty=drop empty-commit.patch >output &&
+	git rev-parse empty-commit^ >expected &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual &&
+	grep "Skipping: empty commit" output
+'
+
+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '
+	git am --empty=keep empty-commit.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git show empty-commit --format="%s" >expected &&
+	git show HEAD --format="%s" >actual &&
+	test_cmp actual expected
+'
+
 test_done

From patchwork Tue Dec  7 05:01:35 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=
 <aleen42@vip.qq.com>
X-Patchwork-Id: 12661027
Return-Path: <git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C2D8BC433EF
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 05:01:48 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229843AbhLGFFQ (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 00:05:16 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52656 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229662AbhLGFFL (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 00:05:11 -0500
Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com
 [IPv6:2a00:1450:4864:20::435])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47EAEC061746
        for <git@vger.kernel.org>; Mon,  6 Dec 2021 21:01:41 -0800 (PST)
Received: by mail-wr1-x435.google.com with SMTP id u1so26806616wru.13
        for <git@vger.kernel.org>; Mon, 06 Dec 2021 21:01:41 -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:mime-version
         :content-transfer-encoding:fcc:to:cc;
        bh=/TeKtEeWKs5URaMainuOxak7G3lGI2mqCd0xLVXxMYg=;
        b=arHpnsF6Ur+ckqvD7AaBib+n16f1Srp9YotuEuJQWBTukitE42/Y2GlDQdtMl3O3fn
         7jbgMtptG4MMj+xNl67Wxo7dfGeO1ZnAbqBucNZL81A6wdN3IxNCsQuwPN4k5K3Bbz28
         CE4NkrXwnaAlZ2EYFClQXEnOLiAlMNR61fMOr04zNbQSHC75QQsQYCWNZiKkPG9SNCN2
         QknXep8VBhxnlZTYyXNmfrIkP/5ZeGD3+PGXRLA41Of4MUBJ+ylkifiFcA1Aneboq0lM
         M/JvvFqPcOevub1S/ucbhtyaa9gyXuuibbpeiJsED72SWlCiBva4bhWU81eplWn6tg74
         C4Ng==
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:mime-version:content-transfer-encoding:fcc:to:cc;
        bh=/TeKtEeWKs5URaMainuOxak7G3lGI2mqCd0xLVXxMYg=;
        b=aIZ/rlhsXxxoYZEw6h4XLZKv3TNI9IhcYU1rSWwZrURhdIGoVcdyM8tC0Cb/qwb80T
         CdnIO9qWd56uCFWGG1LEJ5JYpFZuxA+VXDPfixwqBhlv7BNrufXGQI/F2caVw19EGyC4
         IL04kMBUDULxRVY6BzIjAax4LfKx9q3dooHea2/xi1JyE025QI2K4N70wzIlw+XsdWTU
         qhtPjujLZuk3fhhhNwvPFI7VdRip2EUPkagAunMzZaqfYbforGjEdd7tT07Qt863dRcw
         Qhx8gHvfTFwNGt4Xd67iwIbsMJc2ZVBIUwIvOBBsISuDIh/2ZGQwwXH6RGLLnBd+Q7XO
         ggVw==
X-Gm-Message-State: AOAM533ooUBeXHe0i8Zs4gzj9elvVjK49vA+rSR10y5kXydIpuuCkLrL
        7eL/6WouRophTX34HhpUEsBcI/KgERc=
X-Google-Smtp-Source: 
 ABdhPJzTD9ZR/KR5YAqkxxO13FH5/vS2+Q5/yyHLCCzAs3HGQ7pTLRr8gOWGaE7vXaX0EL9cQI5fZg==
X-Received: by 2002:a5d:4312:: with SMTP id
 h18mr48928498wrq.626.1638853299648;
        Mon, 06 Dec 2021 21:01:39 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 r7sm13143224wrq.29.2021.12.06.21.01.39
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Mon, 06 Dec 2021 21:01:39 -0800 (PST)
Message-Id: 
 <abcdfa1b3755f92bacff3301524ea56913460a58.1638853296.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
References: <pull.1076.v15.git.1638783690.gitgitgadget@gmail.com>
        <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 05:01:35 +0000
Subject: [PATCH v16 3/3] am: support --allow-empty to record specific empty
 patches
MIME-Version: 1.0
Fcc: Sent
To: git@vger.kernel.org
Cc: =?utf-8?b?UmVuw6k=?= Scharfe <l.s.r@web.de>,
 Phillip Wood <phillip.wood123@gmail.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Elijah Newren <newren@gmail.com>,
 Aleen =?utf-8?b?5b6Q5rKb5paH?= <pwxu@coremail.cn>,
 Aleen <aleen42@vip.qq.com>,
 =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?=  <aleen42@vip.qq.com>
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
From: =?utf-8?b?5b6Q5rKb5paHIChBbGVlbik=?= <aleen42@vip.qq.com>

From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
 <aleen42@vip.qq.com>

This option helps to record specific empty patches in the middle
of an am session. However, it is a valid resume value only when:

    1. index has not changed
    2. lacking a branch

Signed-off-by: 徐沛文 (Aleen) <aleen42@vip.qq.com>
---
 Documentation/git-am.txt |  7 +++++-
 builtin/am.c             | 37 +++++++++++++++++++++-------
 t/t4150-am.sh            | 53 ++++++++++++++++++++++++++++++++++++++++
 t/t7512-status-help.sh   |  1 +
 wt-status.c              |  3 +++
 5 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 7676bd58ae7..8d3aa552a20 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 	 [--quoted-cr=<action>]
 	 [--empty=(stop|drop|keep)]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)
 
 DESCRIPTION
 -----------
@@ -200,6 +200,11 @@ default.   You can use `--no-utf8` to override this.
 	the e-mail message; if `diff`, show the diff portion only.
 	Defaults to `raw`.
 
+--allow-empty::
+	After a patch failure on an input e-mail message lacking a patch,
+	the user can still record the empty patch as an empty commit with
+	the contents of the e-mail message as its log.
+
 DISCUSSION
 ----------
 
diff --git a/builtin/am.c b/builtin/am.c
index f45aa33366f..05cbb42dd12 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1825,7 +1825,8 @@ static void am_run(struct am_state *state, int resume)
 				to_keep = 1;
 				break;
 			case STOP_ON_EMPTY_COMMIT:
-				printf_ln(_("Patch is empty."));
+				printf_ln(_("Patch is empty.\n"
+					    "If you want to record it as an empty commit, run \"git am --allow-empty\"."));
 				die_user_resolve(state);
 				break;
 			}
@@ -1898,21 +1899,34 @@ next:
 /**
  * Resume the current am session after patch application failure. The user did
  * all the hard work, and we do not have to do any patch application. Just
- * trust and commit what the user has in the index and working tree.
+ * trust and commit what the user has in the index and working tree. If `allow_empty`
+ * is true, commit as an empty commit when index had not changed and lacking a patch.
  */
-static void am_resolve(struct am_state *state)
+static void am_resolve(struct am_state *state, int allow_empty)
 {
+	int index_changed;
+
 	validate_resume_state(state);
 
 	say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
 
-	if (!repo_index_has_changes(the_repository, NULL, NULL)) {
-		printf_ln(_("No changes - did you forget to use 'git add'?\n"
-			"If there is nothing left to stage, chances are that something else\n"
-			"already introduced the same changes; you might want to skip this patch."));
+	index_changed = repo_index_has_changes(the_repository, NULL, NULL);
+	if (allow_empty && (index_changed || !is_empty_or_missing_file(am_path(state, "patch")))) {
+		printf_ln(_("Invalid resume value."));
 		die_user_resolve(state);
 	}
 
+	if (!index_changed) {
+		if (allow_empty)
+			printf_ln(_("No changes - record it as an empty commit."));
+		else {
+			printf_ln(_("No changes - did you forget to use 'git add'?\n"
+				    "If there is nothing left to stage, chances are that something else\n"
+				    "already introduced the same changes; you might want to skip this patch."));
+			die_user_resolve(state);
+		}
+	}
+
 	if (unmerged_cache()) {
 		printf_ln(_("You still have unmerged paths in your index.\n"
 			"You should 'git add' each file with resolved conflicts to mark them as such.\n"
@@ -2237,7 +2251,8 @@ enum resume_type {
 	RESUME_SKIP,
 	RESUME_ABORT,
 	RESUME_QUIT,
-	RESUME_SHOW_PATCH
+	RESUME_SHOW_PATCH,
+	RESUME_ALLOW_EMPTY
 };
 
 struct resume_mode {
@@ -2390,6 +2405,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		  N_("show the patch being applied"),
 		  PARSE_OPT_CMDMODE | PARSE_OPT_OPTARG | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 		  parse_opt_show_current_patch, RESUME_SHOW_PATCH },
+		OPT_CMDMODE(0, "allow-empty", &resume.mode,
+			N_("record the empty patch as an empty commit"),
+			RESUME_ALLOW_EMPTY),
 		OPT_BOOL(0, "committer-date-is-author-date",
 			&state.committer_date_is_author_date,
 			N_("lie about committer date")),
@@ -2498,7 +2516,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		am_run(&state, 1);
 		break;
 	case RESUME_RESOLVED:
-		am_resolve(&state);
+	case RESUME_ALLOW_EMPTY:
+		am_resolve(&state, resume.mode == RESUME_ALLOW_EMPTY ? 1 : 0);
 		break;
 	case RESUME_SKIP:
 		am_skip(&state);
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index ce8e8e79ace..e154b4201b7 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -1201,4 +1201,57 @@ test_expect_success 'record as an empty commit when meeting e-mail message that
 	test_cmp actual expected
 '
 
+test_expect_success 'skip an empty patch in the middle of an am session' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty." err &&
+	grep "If you want to record it as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --skip &&
+	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 an empty patch as an empty commit in the middle of an am session' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty." err &&
+	grep "If you want to record it as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --allow-empty &&
+	test_path_is_missing .git/rebase-apply &&
+	git show empty-commit --format="%s" >expected &&
+	git show HEAD --format="%s" >actual &&
+	test_cmp actual expected
+'
+
+test_expect_success 'cannot create empty commits when the index is changed' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	: >empty-file &&
+	git add empty-file &&
+	test_must_fail git am --allow-empty >err &&
+	grep "Invalid resume value." err
+'
+
+test_expect_success 'cannot create empty commits when there is a clean index due to merge conflicts' '
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	grep "Invalid resume value." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+'
+
+test_expect_success 'cannot create empty commits when there is unmerged index due to merge conflicts' '
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am -3 seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	grep "Invalid resume value." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+'
+
 test_done
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 7f2956d77ad..9309becfe03 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -658,6 +658,7 @@ test_expect_success 'status in an am session: empty patch' '
 On branch am_empty
 You are in the middle of an am session.
 The current patch is empty.
+  (use "git am --allow-empty" to record this patch as an empty commit)
   (use "git am --skip" to skip this patch)
   (use "git am --abort" to restore the original branch)
 
diff --git a/wt-status.c b/wt-status.c
index 5d215f4e4f1..d578a0e9192 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1227,6 +1227,9 @@ static void show_am_in_progress(struct wt_status *s,
 		if (!s->state.am_empty_patch)
 			status_printf_ln(s, color,
 				_("  (fix conflicts and then run \"git am --continue\")"));
+		else
+			status_printf_ln(s, color,
+				_("  (use \"git am --allow-empty\" to record this patch as an empty commit)"));
 		status_printf_ln(s, color,
 			_("  (use \"git am --skip\" to skip this patch)"));
 		status_printf_ln(s, color,