From patchwork Tue Dec  7 08:31:51 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: 12661329
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 1D173C433FE
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 08:32:00 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232909AbhLGIf3 (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 03:35:29 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44776 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S232891AbhLGIf1 (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 03:35:27 -0500
Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com
 [IPv6:2a00:1450:4864:20::42e])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1313C061746
        for <git@vger.kernel.org>; Tue,  7 Dec 2021 00:31:57 -0800 (PST)
Received: by mail-wr1-x42e.google.com with SMTP id v11so27771031wrw.10
        for <git@vger.kernel.org>; Tue, 07 Dec 2021 00:31:57 -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=qCNYkthkvw4QSiD2TTdffmnWc/SXi9w16htu3dhu9W0C5ZQ64Ij++L8Vyyd5vahGM8
         +devWaJX/7JtV+kBcIm1xmJ07KWN5QzESAe0cRsRH0J6t2Zwoa/OFq/D7VZO0J9+JZ7t
         XbVFmVfO7VgYlQ36Ou+yizYRA1GxTchWI78eF5OvlS/XjY5U0TMhOZ1uFaO8XAY1t+PL
         vJhb7mLR0rWs/jGFdtplL/OfDMY07Knc2/4KsEzerD4VtJJHeo/pAdpM0BPAQ4MxFEll
         oDDaojal3B2kWRL/Wwv4wjtY+tZYIPS0OeGdl8vsMYX87h9YXB4xguhN8I5U9dD0hIUv
         mF7g==
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=wR/mTeZ4Qns1zGC3t2mAWe/YcpYIfMlHeLyns6MEnQ8P0DZXpMPfTdHTnJHkkiFTFs
         KYGxO/G0jSRioOr3+cHsGCZOdVeH+VMH2+TQQF9d47upmC8EYevZ/tbb/Lkp0707Wzy7
         eoukafI5TTPqAezNYY9G6s/30JPXIU8Cc8IudVyys4OgpS0puq9aTbnyexn3cyVd4+KJ
         mFyANdw8sgGCsdjXQdijtX7kJPLHcmS0nQzaprhbU4eM2xhCeLeLbgVVxcvPMIcRK8eP
         KEG+8xFUTWITaxbd8tk2CGMFvw4jG97t2DACOMsVhNa3s/5/Yip/N6XVAYy//CFImqaY
         RxHA==
X-Gm-Message-State: AOAM532o+i7PEwQqS32MpnWhHb2AhE+Vvzh0M/5wuz4/M7NiEozZxhwl
        FwffLpo810b0w2N2Jz8JimFZjQc1miA=
X-Google-Smtp-Source: 
 ABdhPJz6X9ECZOP0GMG+7X34mMx3UrjG5MIbdBNNr1leHQaNSivNzG1TCbYwuQvlVdn7wGFXHmxDiA==
X-Received: by 2002:a5d:668f:: with SMTP id
 l15mr48967549wru.182.1638865916336;
        Tue, 07 Dec 2021 00:31:56 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 v8sm13641770wrd.84.2021.12.07.00.31.54
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 07 Dec 2021 00:31:54 -0800 (PST)
Message-Id: 
 <a524ca6adfa2adc02e517b7be5199b0c071134c4.1638865913.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
References: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
        <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 08:31:51 +0000
Subject: [PATCH v17 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 08:31:52 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: 12661331
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 DF6E8C433F5
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 08:32:00 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232917AbhLGIfa (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 03:35:30 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44784 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S232585AbhLGIf2 (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 03:35:28 -0500
Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com
 [IPv6:2a00:1450:4864:20::436])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4064C061748
        for <git@vger.kernel.org>; Tue,  7 Dec 2021 00:31:58 -0800 (PST)
Received: by mail-wr1-x436.google.com with SMTP id a9so27747498wrr.8
        for <git@vger.kernel.org>; Tue, 07 Dec 2021 00:31:58 -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=qxKbcufE2ljxhOXFLTvddNXMcXg0NU8jK/OZ1eqpBZrmSBceFhLpxxHIK1T6IUK7jL
         g8HejuLmC1pMiiLz59qiqdyRE+fJcaX/1WeCMrmNcVgGiNBquxrqf3gd2RyA9cZydsf1
         gYSLJswgoZr34anPQkscVr8I8XEO9Gh0J4CFZxCkloTA058qlhBzK1GJlGWpLPhXBC3C
         8YpaYxFZ0aS9hMn7VFW8OL9iaGzK9mxqVzBCSyjac5y4wYiXhXYfNKNxVe23IzlvIq8u
         oexs3u102Q5LRktPwQscYn6Nwdt3ColIsG0AG3r2wAmmF1YVgMkNkLFUrNTONCA1cgo4
         MBeQ==
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=stuHAteTuay/eGdSRlqAdwMUTDFItMBAeCIw7paF3cPduhqiKQCD10/Ny37q/dHJlj
         ku5pM5kHxwoW5BFHeS6LOvNlK5raMKC3xpWJ2dw+WvhuUy+ZjreBMY99SSIXoy6hdPxC
         gCzR2z+QVAWZfgo8V/28D55hXELk4bhhSca89/YkgIXxe4mg08ISlNzgsg/e5KgNyix2
         1BVq+ecmtkyvNyS6nSLoeeNSPxlsOP5X7Kv19GOemxoirD5eaUfnhI5rZ7gV5GiK0mhz
         ZBAfEBK6EGMY3sHN43a5Bd/DlCnruvUSy2J2tDLCqG3tY5bS0UJGZtZE9LxU1B7Ofdfj
         dEzg==
X-Gm-Message-State: AOAM531vUMVE+JH9wvWhGTUGmW5UPQF8KwSIWRLCe1AQHLad3SGTE33X
        eN3nGf2fi6FOnpvT8hy7sFrX2IRtV+4=
X-Google-Smtp-Source: 
 ABdhPJxFuGGMgz2t9nGgCRAq3Ix+I2AkjoDdq39Iqg2NW7sj5tX2pe/is1Ua48NhMpiA7/0EsqMFxw==
X-Received: by 2002:adf:d1e2:: with SMTP id g2mr50461839wrd.179.1638865917206;
        Tue, 07 Dec 2021 00:31:57 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 t17sm1959563wmq.15.2021.12.07.00.31.56
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 07 Dec 2021 00:31:56 -0800 (PST)
Message-Id: 
 <b9e03f2342b3fc52515f063f28b34ad9e1dc338a.1638865913.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
References: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
        <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 08:31:52 +0000
Subject: [PATCH v17 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 08:31:53 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: 12661333
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 632C2C433EF
	for <git@archiver.kernel.org>; Tue,  7 Dec 2021 08:32:07 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S232910AbhLGIfg (ORCPT <rfc822;git@archiver.kernel.org>);
        Tue, 7 Dec 2021 03:35:36 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44792 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S232891AbhLGIf3 (ORCPT <rfc822;git@vger.kernel.org>);
        Tue, 7 Dec 2021 03:35:29 -0500
Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com
 [IPv6:2a00:1450:4864:20::436])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3888C061359
        for <git@vger.kernel.org>; Tue,  7 Dec 2021 00:31:59 -0800 (PST)
Received: by mail-wr1-x436.google.com with SMTP id v11so27771200wrw.10
        for <git@vger.kernel.org>; Tue, 07 Dec 2021 00:31:59 -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=J7DLlG6zsP99VZ80Scj5Y3zVfPJjO8z7GJFY3hnxSJs=;
        b=QABG+P8sfJxYGMYFxr1sDKLDvs4marvB8VteJApCR6dvlTmV0Mrop/LnF/3KQoNpDa
         Pw17aWyBEpibKsBbhimt2FbGvyBgBEkCoPRbWIepJCdTXVEB9ApRIo8HCWbL2zcVY2Rv
         7fxawhaYhwpBL6P2V4JQql8aN7F6t9fhEfk/E8IUfK0QOXnQYrRn1qWwiXO4uGpB+/Uw
         ateRxIARw7gqd2EH+YFcUXKMkVJ+zUaL7glRzpByei9bOhjgbwL+OpE7VEtmXBezyi1W
         7PK/9Ehjo+RgQ8EppuD6iK8mMOt2UXMImaDG3/XY8giA6m1ZNAcyWZyV/V8JbQckx1q4
         3cQA==
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=J7DLlG6zsP99VZ80Scj5Y3zVfPJjO8z7GJFY3hnxSJs=;
        b=7TS7Jyqg4PxcbvaNHk/tMDRjw3FMXRnczXx6kaBi58StLf6LDGaFzb4wAikjCsMfAH
         hxS22sV9MP4AtMSAzDoOajsH9e3dNd3+rBbg3oiMMlLn4idUFK1VjY/SNSZ+xy0LIv0+
         gtA7ZUbojZuq6YhtG6MbN+UtiiPFm8fgomgFGHMz8Ro+pdccclgjtAe1X2q5wf3g12Bk
         rDlTvXVC1yaPbN2Y+oWykryF/y5MROPf12u3ZghxHcEgzH+tfdWXSJPw1aLM4KcN0ntG
         jWdmBc83nnUvVWQUGEPs85ZXGgBvTbNlDP25aEDjNvQ1v1UHKpTXjCkunL9n+IXM6Uf9
         Wnuw==
X-Gm-Message-State: AOAM531BtI/338iF9qmjQQu3FweHeb4vAug2YkQpH2QIQknUAlR0ENAV
        1MZcDogD7eP2GtK7I3Y8hiCIDdS2/cc=
X-Google-Smtp-Source: 
 ABdhPJzb4bFd3eD+lrLr4nhAHfprdmrvETCRJr5azJIRg+M/FFd05mkFFFitp0q7ANKlp9mRvvoWPw==
X-Received: by 2002:a5d:628f:: with SMTP id
 k15mr51891317wru.363.1638865918048;
        Tue, 07 Dec 2021 00:31:58 -0800 (PST)
Received: from [127.0.0.1] ([13.74.141.28])
        by smtp.gmail.com with ESMTPSA id
 m21sm13984158wrb.2.2021.12.07.00.31.57
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 07 Dec 2021 00:31:57 -0800 (PST)
Message-Id: 
 <ea2dc088b37670cd7969a57777798b8f5bdd94e4.1638865913.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
References: <pull.1076.v16.git.1638853295.gitgitgadget@gmail.com>
        <pull.1076.v17.git.1638865913.gitgitgadget@gmail.com>
Date: Tue, 07 Dec 2021 08:31:53 +0000
Subject: [PATCH v17 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..89a29ccac89 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 has 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,