{"thread":{"id":"56877","subject":"[PATCH 1/2] doc: git-format-patch: specify the option --always","startedAt":"2021-11-12T05:00:46Z","lastAt":"2021-12-11T09:22:45Z","messageCount":129,"participants":["Aleen via GitGitGadget","René Scharfe","Junio C Hamano","Aleen","Aleen 徐沛文","Phillip Wood","Bagas Sanjaya","Ævar Arnfjörð Bjarmason","Eric Sunshine","Aleen 徐沛文 via GitGitGadget","Johannes Schindelin","徐沛文 (Aleen) via GitGitGadget","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"440957","messageId":"71e6989375c9b8dd00151481e0bb19c991e673f3.1636693095.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.git.1636693095.gitgitgadget@gmail.com","subject":"[PATCH 1/2] doc: git-format-patch: specify the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T04:58:14Z","receivedAt":"2021-11-12T05:00:46Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..a9f2bf94182 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -30,6 +30,7 @@ SYNOPSIS\n \t\t [--range-diff= [--creation-factor=]]\n \t\t [--filename-max-length=]\n \t\t [--progress]\n+\t\t [--always]\n \t\t []\n \t\t [ | ]\n \n@@ -388,6 +389,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.\n --progress::\n \tShow progress reports on stderr as patches are generated.\n \n+--always::\n+\tPatch commits with detailed commit messages,\n+\teven if they emit no changes. (see linkgit:git-diff-tree[1])\n+\n CONFIGURATION\n -------------\n You can specify extra mail header lines to be added to each message,\n-- \ngitgitgadget\n\n"},{"id":"440958","messageId":"pull.1076.git.1636693095.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":null,"subject":"[PATCH 0/2] am: support --always option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T04:58:13Z","receivedAt":"2021-11-12T05:00:46Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with empty commit message, git-am should support\napplying and committing with empty patches.\n\nAleen (2):\n doc: git-format-patch: specify the option --always\n am: support --always option to am empty commits\n\n Documentation/git-am.txt | 5 +++++\n Documentation/git-format-patch.txt | 5 +++++\n builtin/am.c | 18 ++++++++++++++++--\n t/t4150-am.sh | 25 +++++++++++++++++++++++++\n 4 files changed, 51 insertions(+), 2 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n-- \ngitgitgadget\n"},{"id":"440959","messageId":"59b1417da3754add11e72692ec11c09e486269e4.1636693095.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.git.1636693095.gitgitgadget@gmail.com","subject":"[PATCH 2/2] am: support --always option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T04:58:15Z","receivedAt":"2021-11-12T05:00:46Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 5 +++++\n builtin/am.c | 18 ++++++++++++++++--\n t/t4150-am.sh | 25 +++++++++++++++++++++++++\n 3 files changed, 46 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..de5d11e404c 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--always]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -159,6 +160,10 @@ default. You can use `--no-utf8` to override this.\n \tcountermand both `commit.gpgSign` configuration variable, and\n \tearlier `--gpg-sign`.\n \n+--always::\n+\tApply patches of commits with detailed commit messages,\n+\teven if they emit no changes. (see linkgit:git-format-patch[1])\n+\n --continue::\n -r::\n --resolved::\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..d11efc16f92 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -124,6 +124,8 @@ struct am_state {\n \tint ignore_date;\n \tint allow_rerere_autoupdate;\n \tconst char *sign_commit;\n+\tint always;\n+\tint empty_commit;\n \tint rebasing;\n };\n \n@@ -1249,8 +1251,12 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t}\n \n \tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n+\t\tif (state->always) {\n+\t\t\tstate->empty_commit = 1;\n+\t\t} else {\n+\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\tdie_user_resolve(state);\n+\t\t}\n \t}\n \n \tstrbuf_addstr(&msg, \"\\n\\n\");\n@@ -1792,6 +1798,9 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (state->empty_commit)\n+\t\t\tgoto commit;\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1836,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2367,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\tOPT_BOOL(0, \"always\", &state.always,\n+\t\t\tN_(\"always apply patch event if the patch is empty\")),\n+\t\tOPT_HIDDEN_BOOL(0, \"empty-commit\", &state.empty_commit,\n+\t\t\tN_(\"(internal use for skipping git-apply to empty commits)\")),\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..5b3617857a8 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,12 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1158,23 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'am a real empty patch with the --always option' '\n+\trm -fr .git/rebase-apply &&\n+\tgit reset --hard &&\n+\ttest_must_fail git am --always empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'am a patch with empty commits' '\n+\tgrep \"empty commit\" empty-commit.patch &&\n+\trm -fr .git/rebase-apply &&\n+\tgit reset --hard &&\n+\tgit checkout empty-commit^ &&\n+\tgit am --always empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit cat-file commit HEAD >actual &&\n+\ttest_i18ngrep \"empty commit\" actual\n+'\n+\n test_done\n-- \ngitgitgadget\n"},{"id":"440961","messageId":"6da5e984-1dcf-4c55-976c-49ffb8d128bf@web.de","threadId":"56877","inReplyTo":"pull.1076.git.1636693095.gitgitgadget@gmail.com","subject":"Re: [PATCH 0/2] am: support --always option to am empty commits","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2021-11-12T06:17:47Z","receivedAt":"2021-11-12T06:17:56Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Am 12.11.21 um 05:58 schrieb Aleen via GitGitGadget:\n> Since that git has supported the --always option for the git-format-patch\n> command to create a patch with empty commit message, git-am should support\n> applying and committing with empty patches.\n\nThe symmetry is compelling, but \"always\" is quite generic. I can see\ne.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n\ngit commit and cherry-pick have --allow-empty, which is (a bit) more\nspecific. That seems to me a better option name to copy for a commit-\ncreating command like git am.\n\nRené\n"},{"id":"440962","messageId":"xmqqy25tj2fi.fsf@gitster.g","threadId":"56877","inReplyTo":"6da5e984-1dcf-4c55-976c-49ffb8d128bf@web.de","subject":"Re: [PATCH 0/2] am: support --always option to am empty commits","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-12T06:47:13Z","receivedAt":"2021-11-12T06:47:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Scharfe writes:\n\n> Am 12.11.21 um 05:58 schrieb Aleen via GitGitGadget:\n>> Since that git has supported the --always option for the git-format-patch\n>> command to create a patch with empty commit message, git-am should support\n>> applying and committing with empty patches.\n>\n> The symmetry is compelling, but \"always\" is quite generic. I can see\n> e.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n\nWhat symmetry?\n\n> git commit and cherry-pick have --allow-empty, which is (a bit) more\n> specific. That seems to me a better option name to copy for a commit-\n> creating command like git am.\n\nThat one I can believe, even though I do not necessarily think it is\na good idea to add such an option.\n"},{"id":"440963","messageId":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.git.1636693095.gitgitgadget@gmail.com","subject":"[PATCH v2 0/4] am: support --allow-empty option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T06:53:56Z","receivedAt":"2021-11-12T06:54:08Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with empty commit message, git-am should support\napplying and committing with empty patches.\n\nChanges since v1:\n\n * test: am: add the case when not passing the --always option\n * chore: am: rename the --always option to --allow-empty\n\nAleen (4):\n doc: git-format-patch: specify the option --always\n am: support --always option to am empty commits\n test: am: add the case when not passing the --always option\n chore: am: rename the --always option to --allow-empty\n\n Documentation/git-am.txt | 5 +++++\n Documentation/git-format-patch.txt | 5 +++++\n builtin/am.c | 18 +++++++++++++--\n t/t4150-am.sh | 35 ++++++++++++++++++++++++++++++\n 4 files changed, 61 insertions(+), 2 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n\nRange-diff vs v1:\n\n 1: 71e6989375c = 1: 71e6989375c doc: git-format-patch: specify the option --always\n 2: 59b1417da37 = 2: 59b1417da37 am: support --always option to am empty commits\n -: ----------- > 3: da024ced668 test: am: add the case when not passing the --always option\n -: ----------- > 4: 45e9720f40b chore: am: rename the --always option to --allow-empty\n\n-- \ngitgitgadget\n"},{"id":"440964","messageId":"71e6989375c9b8dd00151481e0bb19c991e673f3.1636700040.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","subject":"[PATCH v2 1/4] doc: git-format-patch: specify the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T06:53:57Z","receivedAt":"2021-11-12T06:54:10Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..a9f2bf94182 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -30,6 +30,7 @@ SYNOPSIS\n \t\t [--range-diff= [--creation-factor=]]\n \t\t [--filename-max-length=]\n \t\t [--progress]\n+\t\t [--always]\n \t\t []\n \t\t [ | ]\n \n@@ -388,6 +389,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.\n --progress::\n \tShow progress reports on stderr as patches are generated.\n \n+--always::\n+\tPatch commits with detailed commit messages,\n+\teven if they emit no changes. (see linkgit:git-diff-tree[1])\n+\n CONFIGURATION\n -------------\n You can specify extra mail header lines to be added to each message,\n-- \ngitgitgadget\n\n"},{"id":"440965","messageId":"59b1417da3754add11e72692ec11c09e486269e4.1636700040.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","subject":"[PATCH v2 2/4] am: support --always option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T06:53:58Z","receivedAt":"2021-11-12T06:54:12Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 5 +++++\n builtin/am.c | 18 ++++++++++++++++--\n t/t4150-am.sh | 25 +++++++++++++++++++++++++\n 3 files changed, 46 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..de5d11e404c 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--always]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -159,6 +160,10 @@ default. You can use `--no-utf8` to override this.\n \tcountermand both `commit.gpgSign` configuration variable, and\n \tearlier `--gpg-sign`.\n \n+--always::\n+\tApply patches of commits with detailed commit messages,\n+\teven if they emit no changes. (see linkgit:git-format-patch[1])\n+\n --continue::\n -r::\n --resolved::\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..d11efc16f92 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -124,6 +124,8 @@ struct am_state {\n \tint ignore_date;\n \tint allow_rerere_autoupdate;\n \tconst char *sign_commit;\n+\tint always;\n+\tint empty_commit;\n \tint rebasing;\n };\n \n@@ -1249,8 +1251,12 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t}\n \n \tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n+\t\tif (state->always) {\n+\t\t\tstate->empty_commit = 1;\n+\t\t} else {\n+\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\tdie_user_resolve(state);\n+\t\t}\n \t}\n \n \tstrbuf_addstr(&msg, \"\\n\\n\");\n@@ -1792,6 +1798,9 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (state->empty_commit)\n+\t\t\tgoto commit;\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1836,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2367,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\tOPT_BOOL(0, \"always\", &state.always,\n+\t\t\tN_(\"always apply patch event if the patch is empty\")),\n+\t\tOPT_HIDDEN_BOOL(0, \"empty-commit\", &state.empty_commit,\n+\t\t\tN_(\"(internal use for skipping git-apply to empty commits)\")),\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..5b3617857a8 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,12 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1158,23 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'am a real empty patch with the --always option' '\n+\trm -fr .git/rebase-apply &&\n+\tgit reset --hard &&\n+\ttest_must_fail git am --always empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'am a patch with empty commits' '\n+\tgrep \"empty commit\" empty-commit.patch &&\n+\trm -fr .git/rebase-apply &&\n+\tgit reset --hard &&\n+\tgit checkout empty-commit^ &&\n+\tgit am --always empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit cat-file commit HEAD >actual &&\n+\ttest_i18ngrep \"empty commit\" actual\n+'\n+\n test_done\n-- \ngitgitgadget\n\n"},{"id":"440966","messageId":"da024ced6686bfcae3e824c14ba0a7550c8317ad.1636700040.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","subject":"[PATCH v2 3/4] test: am: add the case when not passing the --always option","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T06:53:59Z","receivedAt":"2021-11-12T06:54:13Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n t/t4150-am.sh | 12 +++++++++++-\n 1 file changed, 11 insertions(+), 1 deletion(-)\n\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 5b3617857a8..364c61ba198 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -1166,7 +1166,17 @@ test_expect_success 'am a real empty patch with the --always option' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'am a patch with empty commits' '\n+test_expect_success 'am a patch of empty commits without the --always option' '\n+\tgrep \"empty commit\" empty-commit.patch &&\n+\trm -fr .git/rebase-apply &&\n+\tgit reset --hard &&\n+\tgit checkout empty-commit^ &&\n+\ttest_must_fail git am empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err\n+'\n+\n+test_expect_success 'am a patch of empty commits with the --always option' '\n \tgrep \"empty commit\" empty-commit.patch &&\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-- \ngitgitgadget\n\n"},{"id":"440967","messageId":"45e9720f40bbf71ceea72ac464e3343f9b47a04f.1636700040.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","subject":"[PATCH v2 4/4] chore: am: rename the --always option to --allow-empty","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-12T06:54:00Z","receivedAt":"2021-11-12T06:54:15Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 4 ++--\n builtin/am.c | 8 ++++----\n t/t4150-am.sh | 10 +++++-----\n 3 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex de5d11e404c..6ed844af9c6 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,7 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n-\t [--always]\n+\t [--allow-empty]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -160,7 +160,7 @@ default. You can use `--no-utf8` to override this.\n \tcountermand both `commit.gpgSign` configuration variable, and\n \tearlier `--gpg-sign`.\n \n---always::\n+--allow-empty::\n \tApply patches of commits with detailed commit messages,\n \teven if they emit no changes. (see linkgit:git-format-patch[1])\n \ndiff --git a/builtin/am.c b/builtin/am.c\nindex d11efc16f92..a8661098acf 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -124,7 +124,7 @@ struct am_state {\n \tint ignore_date;\n \tint allow_rerere_autoupdate;\n \tconst char *sign_commit;\n-\tint always;\n+\tint allow_empty;\n \tint empty_commit;\n \tint rebasing;\n };\n@@ -1251,7 +1251,7 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t}\n \n \tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tif (state->always) {\n+\t\tif (state->allow_empty) {\n \t\t\tstate->empty_commit = 1;\n \t\t} else {\n \t\t\tprintf_ln(_(\"Patch is empty.\"));\n@@ -2367,8 +2367,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n-\t\tOPT_BOOL(0, \"always\", &state.always,\n-\t\t\tN_(\"always apply patch event if the patch is empty\")),\n+\t\tOPT_BOOL(0, \"allow-empty\", &state.allow_empty,\n+\t\t\tN_(\"allow to apply patches of empty commits\")),\n \t\tOPT_HIDDEN_BOOL(0, \"empty-commit\", &state.empty_commit,\n \t\t\tN_(\"(internal use for skipping git-apply to empty commits)\")),\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 364c61ba198..b47a0fa41e7 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -1158,15 +1158,15 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n-test_expect_success 'am a real empty patch with the --always option' '\n+test_expect_success 'am a real empty patch with the --allow-empty option' '\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n-\ttest_must_fail git am --always empty.patch 2>actual &&\n+\ttest_must_fail git am --allow-empty empty.patch 2>actual &&\n \techo Patch format detection failed. >expected &&\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'am a patch of empty commits without the --always option' '\n+test_expect_success 'am a patch of empty commits without the --allow-empty option' '\n \tgrep \"empty commit\" empty-commit.patch &&\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n@@ -1176,12 +1176,12 @@ test_expect_success 'am a patch of empty commits without the --always option' '\n \ttest_i18ngrep \"Patch is empty.\" err\n '\n \n-test_expect_success 'am a patch of empty commits with the --always option' '\n+test_expect_success 'am a patch of empty commits with the --allow-empty option' '\n \tgrep \"empty commit\" empty-commit.patch &&\n \trm -fr .git/rebase-apply &&\n \tgit reset --hard &&\n \tgit checkout empty-commit^ &&\n-\tgit am --always empty-commit.patch &&\n+\tgit am --allow-empty empty-commit.patch &&\n \ttest_path_is_missing .git/rebase-apply &&\n \tgit cat-file commit HEAD >actual &&\n \ttest_i18ngrep \"empty commit\" actual\n-- \ngitgitgadget\n"},{"id":"440968","messageId":"tencent_EEC1D953A204CC69ED49D8471A89110F3605@qq.com","threadId":"56877","inReplyTo":"6da5e984-1dcf-4c55-976c-49ffb8d128bf@web.de","subject":"RE: [PATCH 0/2] am: support --always option to am empty commits","fromName":"Aleen","fromEmail":"aleen42@vip.qq.com","sentAt":"2021-11-12T06:42:00Z","receivedAt":"2021-11-12T06:57:18Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Dears René,\n\n> The symmetry is compelling, but \"always\" is quite generic. I can see\n> e.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n\n> git commit and cherry-pick have --allow-empty, which is (a bit) more\n> specific. That seems to me a better option name to copy for a commit-\n> creating command like git am.\n\nIt was designed corresponding to --always option in git-format-patch, which\nwill be pssed into git-diff-tree. As a commit-creating command, --allow-empty\nis apparently a better choice. I will re-submit it, thank you."},{"id":"440971","messageId":"40a6024f.23b9.17d12fb977f.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"xmqqy25tj2fi.fsf@gitster.g","subject":"Re: [PATCH 0/2] am: support --always option to am empty commits","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-12T07:10:17Z","receivedAt":"2021-11-12T07:17:13Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"Dears Junio C Hamano:\n\n> René Scharfe writes:\n> \n> > Am 12.11.21 um 05:58 schrieb Aleen via GitGitGadget:\n> >> Since that git has supported the --always option for the git-format-patch\n> >> command to create a patch with empty commit message, git-am should support\n> >> applying and committing with empty patches.\n> >\n> > The symmetry is compelling, but \"always\" is quite generic. I can see\n> > e.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n> \n> What symmetry?\n> \n> > git commit and cherry-pick have --allow-empty, which is (a bit) more\n> > specific. That seems to me a better option name to copy for a commit-\n> > creating command like git am.\n> \n> That one I can believe, even though I do not necessarily think it is\n> a good idea to add such an option.\n\nIn some cases when we need to migrate commits from one branch to another branch,\nfrom one repo to another repo, it should be necessary.\n\nAleen"},{"id":"440984","messageId":"ca9baf51-28ca-048d-ded6-f4834874f7c3@web.de","threadId":"56877","inReplyTo":"xmqqy25tj2fi.fsf@gitster.g","subject":"Re: [PATCH 0/2] am: support --always option to am empty commits","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2021-11-12T15:28:30Z","receivedAt":"2021-11-12T15:28:41Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Am 12.11.21 um 07:47 schrieb Junio C Hamano:\n> René Scharfe writes:\n>\n>> Am 12.11.21 um 05:58 schrieb Aleen via GitGitGadget:\n>>> Since that git has supported the --always option for the git-format-patch\n>>> command to create a patch with empty commit message, git-am should support\n>>> applying and committing with empty patches.\n>>\n>> The symmetry is compelling, but \"always\" is quite generic. I can see\n>> e.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n>\n> What symmetry?\n\nTo have the same option in both producer and consumer.\n\nRené\n"},{"id":"440987","messageId":"xmqqmtm9tkzz.fsf@gitster.g","threadId":"56877","inReplyTo":"ca9baf51-28ca-048d-ded6-f4834874f7c3@web.de","subject":"Re: [PATCH 0/2] am: support --always option to am empty commits","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-12T16:08:16Z","receivedAt":"2021-11-12T16:08:22Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Scharfe writes:\n\n>>> The symmetry is compelling, but \"always\" is quite generic. I can see\n>>> e.g. someone expecting \"git am --always\" to imply --keep-non-patch.\n>>\n>> What symmetry?\n>\n> To have the same option in both producer and consumer.\n\nWell, \"--always\" that stands for \"--always-show-header\" seeps\nthrough to the command line parser from revision.c layer but that is\nby accident, and is not even documented. We may want to file it as\na bug and fix it later.\n\nAs you mentioned, allow-empty-commit does sound like a much better\nname.\n\n\n"},{"id":"441022","messageId":"xmqqpmr5ow7a.fsf@gitster.g","threadId":"56877","inReplyTo":"71e6989375c9b8dd00151481e0bb19c991e673f3.1636700040.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 1/4] doc: git-format-patch: specify the option --always","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-12T22:17:29Z","receivedAt":"2021-11-12T22:17:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aleen via GitGitGadget\" writes:\n\n> From: Aleen \n> Subject: Re: [PATCH v2 1/4] doc: git-format-patch: specify the option --always\n\n\"specify\" -> \"describe\", perhaps?\n\n> Signed-off-by: Aleen \n> ---\n> Documentation/git-format-patch.txt | 5 +++++\n> 1 file changed, 5 insertions(+)\n>\n> diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\n> index 113eabc107c..a9f2bf94182 100644\n> --- a/Documentation/git-format-patch.txt\n> +++ b/Documentation/git-format-patch.txt\n> @@ -30,6 +30,7 @@ SYNOPSIS\n> \t\t [--range-diff= [--creation-factor=]]\n> \t\t [--filename-max-length=]\n> \t\t [--progress]\n> +\t\t [--always]\n> \t\t []\n> \t\t [ | ]\n> \n> @@ -388,6 +389,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.\n> --progress::\n> \tShow progress reports on stderr as patches are generated.\n> \n> +--always::\n> +\tPatch commits with detailed commit messages,\n> +\teven if they emit no changes. (see linkgit:git-diff-tree[1])\n\nWhat does the verb \"Patch\" mean here? It cannot be what the command\n\"patch\" does, i.e. apply a diff to working tree files, as\nformat-patch does not apply any patch. \n\nWho guarantees that commit messages are detailed? If I write a\ncommit that does not change anything with a one-liner message, would\nthis option make that message more detailed? I doubt that it would\nbe the case.\n\nThis option may sit much better near the --ignore-if-in-upstream\noption. The primary way the command is told which commits to show\nis via its argument ( or ), and we do not\nhave many options to affect the selection of commits, but this one\nand --ignore-if-in-upstream are such options. Borrowing from the\nway the description of that other option is phrased, perhaps\n\n Include patches for commits that do not introduce any change,\n which are omitted by default.\n\nDo not refer to 'git-diff-tree'; I do not think the reader who is\nlearning how to drive format-patch will learn anything new by\nreading that page.\n\nI have a feeling that if we were to endorse and promote this option\nby documenting (note: it was an accident and a mistake that this\noption is understood by underlying revision.c parse machinery, and\nnot a designed behaviour for format-patch to do anything to empty\ncommits), we should give users a better synonym to invoke it, but\nthat can and should be outside of this step.\n"},{"id":"441034","messageId":"xmqq4k8hovy3.fsf@gitster.g","threadId":"56877","inReplyTo":"59b1417da3754add11e72692ec11c09e486269e4.1636700040.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 2/4] am: support --always option to am empty commits","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-12T22:23:00Z","receivedAt":"2021-11-12T22:23:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aleen via GitGitGadget\" writes:\n\n> From: Aleen \n> Subject: Re: [PATCH v2 2/4] am: support --always option to am empty commits\n\nAs the inventor of \"format-patch\" and \"am\", I probably should wish\nthat \"to am\" were by now a valid verb, but no, it is not.\n\nMore importantly, when an empty patch comes, there can be many\ndifferent ways for the \"am\" command to handle it. \"to am empty\ncommits\" does not say how the patch chooses to so and does not make\na very useful title for this commit.\n\nRight now, we error out, simply because it is an easy mistake to\nsave a non-patch e-mail to the mailbox when intending to save a\nseries of patches belonging to a topic, and the user is expected to\nsay \"git am --skip\" to skip over it when it happens. The above\n\"Subject:\" can be read to mean that the new option instead allows\nsuch an empty message to be skipped without stopping and forcing the\nuser to say \"am --skip\", which may be a useful thing to do. Or it\nmay mean that the new option creates an empty commit, using the\ncontents of the e-mail as the commit log message. Does this patch\noffer both behaviour? If so, \"to am\", even though it does not\nconvey a bit of information, might be an acceptable compromise. If\nthe patch implements only one of the behaviours, then we should say\nso. Either one of these two:\n\n am: --always option skips empty patches\n am: --always option records empty patches as empty commits\n\nAlso, I thought that the previous round saw a conclusion that --always\nis a bad name for the option. If we are making the second round,\nlet's not start with a bad name and the \"fix the mistake\" of\nstarting with a bad name in a later step. Just start with the final\nname from the beginning.\n\n> +--always::\n> +\tApply patches of commits with detailed commit messages,\n> +\teven if they emit no changes. (see linkgit:git-format-patch[1])\n\nAlmost the same comment as 1/4 applies to the above description.\n\n --empty-patch=(skip|asis|die)::\n\tThe command usually errors out when seeing an input e-mail\n\tmessage that lacks a patch. When this option is set to\n\t'skip', skip such an e-mail message without erroring out.\n\tWhen this option is set to 'asis', create an empty commit,\n\trecording the contents of the e-mail message as its log.\n\t'die' is the default.\n\n\nperhaps? Assuming that 'skip' would make a useful addition to the\nmix in the future.\n\n> diff --git a/builtin/am.c b/builtin/am.c\n> index 8677ea2348a..d11efc16f92 100644\n> --- a/builtin/am.c\n> +++ b/builtin/am.c\n> @@ -124,6 +124,8 @@ struct am_state {\n> \tint ignore_date;\n> \tint allow_rerere_autoupdate;\n> \tconst char *sign_commit;\n> +\tint always;\n\nOK, so here is where the parse_options() records the command line\noption.\n\n> +\tint empty_commit;\n\nI do not think this addtion of empty_commit member to this structure\nis welcome or necessary.\n\n> \tint rebasing;\n> };\n\n> @@ -1249,8 +1251,12 @@ static int parse_mail(struct am_state *state, const char *mail)\n> \t}\n\n> \tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n> -\t\tprintf_ln(_(\"Patch is empty.\"));\n> -\t\tdie_user_resolve(state);\n> +\t\tif (state->always) {\n> +\t\t\tstate->empty_commit = 1;\n> +\t\t} else {\n> +\t\t\tprintf_ln(_(\"Patch is empty.\"));\n> +\t\t\tdie_user_resolve(state);\n> +\t\t}\n> \t}\n\nI am only thinking aloud, but I suspect that the whole \"if 'patch'\nis empty, do something special\" code logically belongs to the\ncaller. Perhaps we should remove this block altogether and let the\ncode continue the rest of this function. And return 0, as this is\nnot like mail-system-internal-data that we want to pretend did not\neven exist, and have the caller check if \"patch\" file is empty and\nact accordingly.\n\n> @@ -1792,6 +1798,9 @@ static void am_run(struct am_state *state, int resume)\n> \t\tif (state->interactive && do_interactive(state))\n> \t\t\tgoto next;\n> \n> +\t\tif (state->empty_commit)\n> +\t\t\tgoto commit;\n> +\n\nThis is probably a wrong place to jump from. You are bypassing\napplypatch-msg-hook that may be serving as a gate to catch typos\nif you are going to create a commit.\n\nSo, perhaps check if \"patch\" is empty here, using the code you'd\nlift from parse_mail(), and if it is empty then:\n\n - if --empty-commit is set to die (or left default), do the\n printf_ln(_(\"Patch is empty.\")) followed by a call to\n die_user_resolve(state), just like before.\n\n - if it is set to skip, jump to \"next\", just like when\n parse_mail() returned 1.\n\n - otherwise (i.e. you are told to create an empty commit),\n remember the fact that current e-mail has no patch, but continue\n to the next step to run the hook.\n\n> \t\tif (run_applypatch_msg_hook(state))\n> \t\t\texit(1);\n\nAnd after passing the hook, if your earlier check says that there is\nno patch and you are to create an empty commit, jump to \"commit\"\nlabel from here.\n\n> diff --git a/t/t4150-am.sh b/t/t4150-am.sh\n> index 2aaaa0d7ded..5b3617857a8 100755\n> --- a/t/t4150-am.sh\n> +++ b/t/t4150-am.sh\n> @@ -196,6 +196,12 @@ test_expect_success setup '\n> \n> \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n> \n> +\tgit checkout -b empty-commit &&\n> +\tgit commit -m \"empty commit\" --allow-empty &&\n> +\n> +\tgit format-patch --stdout empty-commit^ >empty.patch &&\n> +\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n> +\n> \t# reset time\n> \tsane_unset test_tick &&\n> \ttest_tick\n> @@ -1152,4 +1158,23 @@ test_expect_success 'apply binary blob in partial clone' '\n> \tgit -C client am ../patch\n> '\n> \n> +test_expect_success 'am a real empty patch with the --always option' '\n> +\trm -fr .git/rebase-apply &&\n\nWhat is this one about? If this is trying to clean up the cruft the\nprevious step made, it may be better to do the clean-up in the\nprevious step using test_when_finished.\n\n> +\tgit reset --hard &&\n> +\ttest_must_fail git am --always empty.patch 2>actual &&\n> +\techo Patch format detection failed. >expected &&\n> +\ttest_cmp expected actual\n> +'\n\nIt is curious that the error message the patch touched said \"Patch\nis empty.\" but the test checks for a different message. Are we\ntesting the right failure mode?\n\n> +test_expect_success 'am a patch with empty commits' '\n> +\tgrep \"empty commit\" empty-commit.patch &&\n\nWhat is this testing? If it is checking the sanity of test data we\ncreated earlier, shouldn't we do so where we generated the data\n(i.e. the \"setup\" block that we earlier saw)?\n\n> +\trm -fr .git/rebase-apply &&\n> +\tgit reset --hard &&\n\nThese are trying to clean up the cruft the previous step (added by\nthis patch) may have left. Perhaps these should be done inside\ntest_when_finished of the previous step?\n\n> +\tgit checkout empty-commit^ &&\n> +\tgit am --always empty-commit.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n\nWe should trust \"git am\"'s exit status here, I would think, rather\nthan be so intimate with the internal implementation detail like the\nname of the temporary directory the command uses.\n\n> +\tgit cat-file commit HEAD >actual &&\n> +\ttest_i18ngrep \"empty commit\" actual\n\ntest_i18ngrep -> grep\n\nThe input (i.e. the commit that resulted in this empty patch) said.\n\"empty commit\", and we are making sure that string appears, but we\nare not making sure that is the only string appears in the log\nmessage. Is it because we will later enhance the command to\nautomatically extend the single-liner \"empty patch\" log message into\na lot more detailed one? I doubt it ;-)\n\nMore importantly, the above checks if (part of) the log message is\nrecorded, but does not check if the resulting commit is what is\nexpected, i.e. an empty one.\n\nPerhaps checking with \"grep\" is way too loose a test. Shouldn't we\ndo something like\n\n\tgit show -1 --format='%B' >actual\n\nand compare it with expected \"the log is recorded as-is, and there\nis no change between HEAD^ and HEAD\"?\n\n> +'\n> +\n> test_done\n\nThanks.\n"},{"id":"441127","messageId":"pull.1076.v3.git.1636972769.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v2.git.1636700040.gitgitgadget@gmail.com","subject":"[PATCH v3 0/2] am: support --empty-commit=(die|skip|asis) option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-15T10:39:27Z","receivedAt":"2021-11-15T10:39:36Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with an empty commit message, git-am should\nsupport applying and committing with empty patches.\n\n----------------------------------------------------------------------------\n\nChanges since v1:\n\n 1. add a case when not passing the --always option\n 2. rename the --always option to --allow-empty\n\n----------------------------------------------------------------------------\n\nChanges since v2:\n\n 1. rename the --allow-empty option to --empty-commit\n 2. introduce three different strategies (die|skip|asis) when trying to\n record empty patches as empty commits.\n\n----------------------------------------------------------------------------\n\nAleen (2):\n doc: git-format-patch: describe the option --always\n am: support --empty-commit option to handle empty patches\n\n Documentation/git-am.txt | 9 +++++\n Documentation/git-format-patch.txt | 6 +++-\n builtin/am.c | 48 ++++++++++++++++++++++---\n t/t4150-am.sh | 58 ++++++++++++++++++++++++++++++\n 4 files changed, 115 insertions(+), 6 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v3\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n\nRange-diff vs v2:\n\n 1: 71e6989375c ! 1: 9f1b3dd6d0b doc: git-format-patch: specify the option --always\n @@ Metadata\n Author: Aleen \n \n ## Commit message ##\n - doc: git-format-patch: specify the option --always\n + doc: git-format-patch: describe the option --always\n \n Signed-off-by: Aleen \n \n ## Documentation/git-format-patch.txt ##\n @@ Documentation/git-format-patch.txt: SYNOPSIS\n - \t\t [--range-diff= [--creation-factor=]]\n - \t\t [--filename-max-length=]\n - \t\t [--progress]\n -+\t\t [--always]\n - \t\t []\n - \t\t [ | ]\n - \n -@@ Documentation/git-format-patch.txt: you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.\n - --progress::\n - \tShow progress reports on stderr as patches are generated.\n + \t\t [-n | --numbered | -N | --no-numbered]\n + \t\t [--start-number ] [--numbered-files]\n + \t\t [--in-reply-to=] [--suffix=.]\n +-\t\t [--ignore-if-in-upstream]\n ++\t\t [--ignore-if-in-upstream] [--always]\n + \t\t [--cover-from-description=]\n + \t\t [--rfc] [--subject-prefix=]\n + \t\t [(--reroll-count|-v) ]\n +@@ Documentation/git-format-patch.txt: will want to ensure that threading is disabled for `git send-email`.\n + \tpatches being generated, and any patch that matches is\n + \tignored.\n \n +--always::\n -+\tPatch commits with detailed commit messages,\n -+\teven if they emit no changes. (see linkgit:git-diff-tree[1])\n ++\tInclude patches for commits that do not introduce any change,\n ++\twhich are omitted by default.\n +\n - CONFIGURATION\n - -------------\n - You can specify extra mail header lines to be added to each message,\n + --cover-from-description=::\n + \tControls which parts of the cover letter will be automatically\n + \tpopulated using the branch's description.\n 2: 59b1417da37 ! 2: ef33ce8c6f9 am: support --always option to am empty commits\n @@ Metadata\n Author: Aleen \n \n ## Commit message ##\n - am: support --always option to am empty commits\n + am: support --empty-commit option to handle empty patches\n \n Signed-off-by: Aleen \n \n @@ Documentation/git-am.txt: SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n -+\t [--always]\n ++\t [--empty-commit=(die|skip|asis)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n -@@ Documentation/git-am.txt: default. You can use `--no-utf8` to override this.\n - \tcountermand both `commit.gpgSign` configuration variable, and\n - \tearlier `--gpg-sign`.\n +@@ Documentation/git-am.txt: OPTIONS\n + --quoted-cr=::\n + \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n -+--always::\n -+\tApply patches of commits with detailed commit messages,\n -+\teven if they emit no changes. (see linkgit:git-format-patch[1])\n ++--empty-commit=(die|skip|asis)::\n ++\tThe command usually errors out when seeing an input e-mail\n ++\tmessage that lacks a patch. When this option is set to\n ++\t'skip', skip such an e-mail message without outputting error.\n ++\tWhen this option is set to 'asis', create an empty commit,\n ++\trecording the contents of the e-mail message as its log.\n ++\t'die' is specified by default.\n +\n - --continue::\n - -r::\n - --resolved::\n + -m::\n + --message-id::\n + \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\n \n ## builtin/am.c ##\n -@@ builtin/am.c: struct am_state {\n - \tint ignore_date;\n - \tint allow_rerere_autoupdate;\n - \tconst char *sign_commit;\n -+\tint always;\n -+\tint empty_commit;\n - \tint rebasing;\n +@@ builtin/am.c: enum show_patch_type {\n + \tSHOW_PATCH_DIFF = 1,\n };\n \n ++enum empty_commit_action {\n ++\tDIE_EMPTY_COMMIT = 0, /* output errors */\n ++\tSKIP_EMPTY_COMMIT, /* skip without outputting errors */\n ++\tASIS_EMPTY_COMMIT /* keep recording as empty commits */\n ++};\n ++\n + struct am_state {\n + \t/* state directory path */\n + \tchar *dir;\n +@@ builtin/am.c: struct am_state {\n + \tint message_id;\n + \tint scissors; /* enum scissors_type */\n + \tint quoted_cr; /* enum quoted_cr_action */\n ++\tint empty_commit; /* enum empty_commit_action */\n + \tstruct strvec git_apply_opts;\n + \tconst char *resolvemsg;\n + \tint committer_date_is_author_date;\n +@@ builtin/am.c: static int am_option_parse_quoted_cr(const struct option *opt,\n + \treturn 0;\n + }\n + \n ++static int am_option_parse_empty_commit(const struct option *opt,\n ++\t\t\t\t const char *arg, int unset)\n ++{\n ++\tint *opt_value = opt->value;\n ++\n ++\tif (unset || !strcmp(arg, \"die\"))\n ++\t\t*opt_value = DIE_EMPTY_COMMIT;\n ++\telse if (!strcmp(arg, \"skip\"))\n ++\t\t*opt_value = SKIP_EMPTY_COMMIT;\n ++\telse if (!strcmp(arg, \"asis\"))\n ++\t\t*opt_value = ASIS_EMPTY_COMMIT;\n ++\telse\n ++\t\treturn error(_(\"Invalid value for --empty-commit: %s\"), arg);\n ++\n ++\treturn 0;\n ++}\n ++\n + /**\n + * Returns path relative to the am_state directory.\n + */\n @@ builtin/am.c: static int parse_mail(struct am_state *state, const char *mail)\n + \t\tgoto finish;\n \t}\n \n - \tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n +-\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n -\t\tprintf_ln(_(\"Patch is empty.\"));\n -\t\tdie_user_resolve(state);\n -+\t\tif (state->always) {\n -+\t\t\tstate->empty_commit = 1;\n -+\t\t} else {\n -+\t\t\tprintf_ln(_(\"Patch is empty.\"));\n -+\t\t\tdie_user_resolve(state);\n -+\t\t}\n - \t}\n - \n +-\t}\n +-\n \tstrbuf_addstr(&msg, \"\\n\\n\");\n + \tstrbuf_addbuf(&msg, &mi.log_message);\n + \tstrbuf_stripspace(&msg, 0);\n @@ builtin/am.c: static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n -+\t\tif (state->empty_commit)\n -+\t\t\tgoto commit;\n ++\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n ++\t\t\tif (state->empty_commit == SKIP_EMPTY_COMMIT)\n ++\t\t\t\tgoto next;\n ++\t\t\telse if (state->empty_commit == ASIS_EMPTY_COMMIT) {\n ++\t\t\t\tif (run_applypatch_msg_hook(state))\n ++\t\t\t\t\texit(1);\n ++\t\t\t\telse\n ++\t\t\t\t\tgoto commit;\n ++\t\t\t} else if (state->empty_commit == DIE_EMPTY_COMMIT) {\n ++\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n ++\t\t\t\tdie_user_resolve(state);\n ++\t\t\t}\n ++\t\t}\n +\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n @@ builtin/am.c: int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n -+\t\tOPT_BOOL(0, \"always\", &state.always,\n -+\t\t\tN_(\"always apply patch event if the patch is empty\")),\n -+\t\tOPT_HIDDEN_BOOL(0, \"empty-commit\", &state.empty_commit,\n -+\t\t\tN_(\"(internal use for skipping git-apply to empty commits)\")),\n ++\t\t{ OPTION_CALLBACK, 0, \"empty-commit\", &state.empty_commit,\n ++\t\t \"(die|skip|asis)\",\n ++\t\t N_(\"specify how to handle empty patches\"),\n ++\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\n @@ t/t4150-am.sh: test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n -+test_expect_success 'am a real empty patch with the --always option' '\n -+\trm -fr .git/rebase-apply &&\n -+\tgit reset --hard &&\n -+\ttest_must_fail git am --always empty.patch 2>actual &&\n ++test_expect_success 'still output error with --empty-commit when meeting empty files' '\n ++\ttest_must_fail git am --empty-commit=skip empty.patch 2>actual &&\n +\techo Patch format detection failed. >expected &&\n +\ttest_cmp expected actual\n +'\n +\n -+test_expect_success 'am a patch with empty commits' '\n -+\tgrep \"empty commit\" empty-commit.patch &&\n -+\trm -fr .git/rebase-apply &&\n -+\tgit reset --hard &&\n ++test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n +\tgit checkout empty-commit^ &&\n -+\tgit am --always empty-commit.patch &&\n ++\ttest_must_fail git am empty-commit.patch >err &&\n ++\ttest_path_is_dir .git/rebase-apply &&\n ++\ttest_i18ngrep \"Patch is empty.\" err &&\n ++\trm -fr .git/rebase-apply &&\n ++\n ++\ttest_must_fail git am --empty-commit=die empty-commit.patch >err &&\n ++\ttest_path_is_dir .git/rebase-apply &&\n ++\ttest_i18ngrep \"Patch is empty.\" err &&\n ++\trm -fr .git/rebase-apply &&\n ++\n ++\ttest_must_fail git am --empty-commit=die cover-letter.patch >err &&\n ++\ttest_path_is_dir .git/rebase-apply &&\n ++\ttest_i18ngrep \"Patch is empty.\" err &&\n ++\trm -fr .git/rebase-apply\n ++'\n ++\n ++test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n ++\tgit am --empty-commit=skip empty-commit.patch >err &&\n ++\ttest_path_is_missing .git/rebase-apply &&\n ++\tgit rev-parse empty-commit^ >expected &&\n ++\tgit rev-parse HEAD >actual &&\n ++\ttest_cmp expected actual &&\n ++\n ++\tgit am --empty-commit=skip cover-letter.patch >err &&\n ++\ttest_path_is_missing .git/rebase-apply &&\n ++\tgit rev-parse empty-commit^ >expected &&\n ++\tgit rev-parse HEAD >actual &&\n ++\ttest_cmp expected actual\n ++'\n ++\n ++test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n ++\tgit am --empty-commit=asis empty-commit.patch &&\n ++\ttest_path_is_missing .git/rebase-apply &&\n ++\tgit show empty-commit --format=\"%B\" >expected &&\n ++\tgit show HEAD --format=\"%B\" >actual &&\n ++\tgrep -f actual expected &&\n ++\n ++\tgit am --empty-commit=asis cover-letter.patch &&\n +\ttest_path_is_missing .git/rebase-apply &&\n -+\tgit cat-file commit HEAD >actual &&\n -+\ttest_i18ngrep \"empty commit\" actual\n ++\tgit show empty-commit --format=\"%B\" >expected &&\n ++\tgit show HEAD --format=\"%B\" >actual &&\n ++\tgrep -f actual expected\n +'\n +\n test_done\n 3: da024ced668 < -: ----------- test: am: add the case when not passing the --always option\n 4: 45e9720f40b < -: ----------- chore: am: rename the --always option to --allow-empty\n\n-- \ngitgitgadget\n"},{"id":"441128","messageId":"9f1b3dd6d0b2d3f22fe960b0c3aaa3d888d26c88.1636972769.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v3.git.1636972769.gitgitgadget@gmail.com","subject":"[PATCH v3 1/2] doc: git-format-patch: describe the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-15T10:39:28Z","receivedAt":"2021-11-15T10:39:47Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..be797d7a28f 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n \t\t [-n | --numbered | -N | --no-numbered]\n \t\t [--start-number ] [--numbered-files]\n \t\t [--in-reply-to=] [--suffix=.]\n-\t\t [--ignore-if-in-upstream]\n+\t\t [--ignore-if-in-upstream] [--always]\n \t\t [--cover-from-description=]\n \t\t [--rfc] [--subject-prefix=]\n \t\t [(--reroll-count|-v) ]\n@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.\n \tpatches being generated, and any patch that matches is\n \tignored.\n \n+--always::\n+\tInclude patches for commits that do not introduce any change,\n+\twhich are omitted by default.\n+\n --cover-from-description=::\n \tControls which parts of the cover letter will be automatically\n \tpopulated using the branch's description.\n-- \ngitgitgadget\n\n"},{"id":"441129","messageId":"ef33ce8c6f9e1e1519d3908edd3491fd00d78ac7.1636972769.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v3.git.1636972769.gitgitgadget@gmail.com","subject":"[PATCH v3 2/2] am: support --empty-commit option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-15T10:39:29Z","receivedAt":"2021-11-15T10:39:51Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 9 +++++++\n builtin/am.c | 48 +++++++++++++++++++++++++++++----\n t/t4150-am.sh | 58 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 110 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..d8d3bf202d7 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--empty-commit=(die|skip|asis)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -63,6 +64,14 @@ OPTIONS\n --quoted-cr=::\n \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n+--empty-commit=(die|skip|asis)::\n+\tThe command usually errors out when seeing an input e-mail\n+\tmessage that lacks a patch. When this option is set to\n+\t'skip', skip such an e-mail message without outputting error.\n+\tWhen this option is set to 'asis', create an empty commit,\n+\trecording the contents of the e-mail message as its log.\n+\t'die' is specified by default.\n+\n -m::\n --message-id::\n \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..e7755c1377e 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -87,6 +87,12 @@ enum show_patch_type {\n \tSHOW_PATCH_DIFF = 1,\n };\n \n+enum empty_commit_action {\n+\tDIE_EMPTY_COMMIT = 0, /* output errors */\n+\tSKIP_EMPTY_COMMIT, /* skip without outputting errors */\n+\tASIS_EMPTY_COMMIT /* keep recording as empty commits */\n+};\n+\n struct am_state {\n \t/* state directory path */\n \tchar *dir;\n@@ -118,6 +124,7 @@ struct am_state {\n \tint message_id;\n \tint scissors; /* enum scissors_type */\n \tint quoted_cr; /* enum quoted_cr_action */\n+\tint empty_commit; /* enum empty_commit_action */\n \tstruct strvec git_apply_opts;\n \tconst char *resolvemsg;\n \tint committer_date_is_author_date;\n@@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n \treturn 0;\n }\n \n+static int am_option_parse_empty_commit(const struct option *opt,\n+\t\t\t\t const char *arg, int unset)\n+{\n+\tint *opt_value = opt->value;\n+\n+\tif (unset || !strcmp(arg, \"die\"))\n+\t\t*opt_value = DIE_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"skip\"))\n+\t\t*opt_value = SKIP_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"asis\"))\n+\t\t*opt_value = ASIS_EMPTY_COMMIT;\n+\telse\n+\t\treturn error(_(\"Invalid value for --empty-commit: %s\"), arg);\n+\n+\treturn 0;\n+}\n+\n /**\n * Returns path relative to the am_state directory.\n */\n@@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t\tgoto finish;\n \t}\n \n-\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n-\t}\n-\n \tstrbuf_addstr(&msg, \"\\n\\n\");\n \tstrbuf_addbuf(&msg, &mi.log_message);\n \tstrbuf_stripspace(&msg, 0);\n@@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n+\t\t\tif (state->empty_commit == SKIP_EMPTY_COMMIT)\n+\t\t\t\tgoto next;\n+\t\t\telse if (state->empty_commit == ASIS_EMPTY_COMMIT) {\n+\t\t\t\tif (run_applypatch_msg_hook(state))\n+\t\t\t\t\texit(1);\n+\t\t\t\telse\n+\t\t\t\t\tgoto commit;\n+\t\t\t} else if (state->empty_commit == DIE_EMPTY_COMMIT) {\n+\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\t\tdie_user_resolve(state);\n+\t\t\t}\n+\t\t}\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\t{ OPTION_CALLBACK, 0, \"empty-commit\", &state.empty_commit,\n+\t\t \"(die|skip|asis)\",\n+\t\t N_(\"specify how to handle empty patches\"),\n+\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..13fdf2f86c6 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,12 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1158,56 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'still output error with --empty-commit when meeting empty files' '\n+\ttest_must_fail git am --empty-commit=skip empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n+\tgit checkout empty-commit^ &&\n+\ttest_must_fail git am empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty-commit=die empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty-commit=die cover-letter.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply\n+'\n+\n+test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n+\tgit am --empty-commit=skip empty-commit.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit rev-parse empty-commit^ >expected &&\n+\tgit rev-parse HEAD >actual &&\n+\ttest_cmp expected actual &&\n+\n+\tgit am --empty-commit=skip cover-letter.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit rev-parse empty-commit^ >expected &&\n+\tgit rev-parse HEAD >actual &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n+\tgit am --empty-commit=asis empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit show empty-commit --format=\"%B\" >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\tgrep -f actual expected &&\n+\n+\tgit am --empty-commit=asis cover-letter.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit show empty-commit --format=\"%B\" >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\tgrep -f actual expected\n+'\n+\n test_done\n-- \ngitgitgadget\n"},{"id":"441131","messageId":"60d0c28e.2943.17d234d975d.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"ef33ce8c6f9e1e1519d3908edd3491fd00d78ac7.1636972769.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v3 2/2] am: support --empty-commit option to handle empty patches","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-15T11:13:47Z","receivedAt":"2021-11-15T11:14:52Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"Dears Hamano,\n\nSorry about the late submission, and I have modified it to support the `--empty-commit=(die|skip|asis)` pattern.\n\n> +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n> +\tgit am --empty-commit=asis empty-commit.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\tgit show empty-commit --format=\"%B\" >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\tgrep -f actual expected &&\n> +\n> +\tgit am --empty-commit=asis cover-letter.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\tgit show empty-commit --format=\"%B\" >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\tgrep -f actual expected\n> +'\n\nWhen it comes to the last test case, there are some accidental contents recognized as commit messages inside an empty patch, like:\n\n1. version signatures:\n > -- \n > 2.34.0.rc2.390.gef33ce8c6f\n2. information of cover letter:\n > *** BLURB HERE ***\n >\n > A U Thor (1):\n > empty commit\n\nI don't think it is necessary to fix it within `mailinfo.c`. Can you give me some suggestions on whether this case should be handled?\n\nAleen"},{"id":"441251","messageId":"pull.1076.v4.git.1637039888.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v3.git.1636972769.gitgitgadget@gmail.com","subject":"[PATCH v4 0/2] am: support --empty-commit=(die|skip|asis) option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-16T05:18:06Z","receivedAt":"2021-11-16T05:54:04Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with an empty commit message, git-am should\nsupport applying and committing with empty patches.\n\n----------------------------------------------------------------------------\n\nChanges since v1:\n\n 1. add a case when not passing the --always option\n 2. rename the --always option to --allow-empty\n\n----------------------------------------------------------------------------\n\nChanges since v2:\n\n 1. rename the --allow-empty option to --empty-commit\n 2. introduce three different strategies (die|skip|asis) when trying to\n record empty patches as empty commits.\n\n----------------------------------------------------------------------------\n\nChanges since v3:\n\n 1. generate the missed file for test cases\n 2. grep -f cannot be used under Mac OS\n\n----------------------------------------------------------------------------\n\nAleen (2):\n doc: git-format-patch: describe the option --always\n am: support --empty-commit option to handle empty patches\n\n Documentation/git-am.txt | 9 ++++\n Documentation/git-format-patch.txt | 6 ++-\n builtin/am.c | 48 ++++++++++++++++++--\n t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++\n 4 files changed, 130 insertions(+), 6 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v4\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v4\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n\nRange-diff vs v3:\n\n 1: 9f1b3dd6d0b = 1: 9f1b3dd6d0b doc: git-format-patch: describe the option --always\n 2: ef33ce8c6f9 ! 2: b7e30c9b7ab am: support --empty-commit option to handle empty patches\n @@ t/t4150-am.sh: test_expect_success setup '\n +\tgit commit -m \"empty commit\" --allow-empty &&\n +\n +\tgit format-patch --stdout empty-commit^ >empty.patch &&\n ++\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n +\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n +\n \t# reset time\n @@ t/t4150-am.sh: test_expect_success 'apply binary blob in partial clone' '\n +\n +\tgit am --empty-commit=skip cover-letter.patch >err &&\n +\ttest_path_is_missing .git/rebase-apply &&\n -+\tgit rev-parse empty-commit^ >expected &&\n -+\tgit rev-parse HEAD >actual &&\n -+\ttest_cmp expected actual\n ++\ttest_cmp_rev empty-commit^ HEAD\n +'\n +\n +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n +\tgit am --empty-commit=asis empty-commit.patch &&\n +\ttest_path_is_missing .git/rebase-apply &&\n -+\tgit show empty-commit --format=\"%B\" >expected &&\n ++\t{\n ++\t\tgit show empty-commit --format=\"%B\" &&\n ++\t\techo \"--\" &&\n ++\t\tgit version | sed -e \"s/^git version //\" &&\n ++\t\techo\n ++\t} >expected &&\n +\tgit show HEAD --format=\"%B\" >actual &&\n -+\tgrep -f actual expected &&\n ++\ttest_cmp actual expected &&\n +\n +\tgit am --empty-commit=asis cover-letter.patch &&\n +\ttest_path_is_missing .git/rebase-apply &&\n -+\tgit show empty-commit --format=\"%B\" >expected &&\n ++\t{\n ++\t\techo \"*** SUBJECT HERE ***\" &&\n ++\t\techo &&\n ++\t\techo \"*** BLURB HERE ***\" &&\n ++\t\techo &&\n ++\t\techo \"A U Thor (1):\" &&\n ++\t\tprintf \" \" &&\n ++\t\tgit show empty-commit --format=\"%B\" &&\n ++\t\techo \"--\" &&\n ++\t\tgit version | sed -e \"s/^git version //\" &&\n ++\t\techo\n ++\t} >expected &&\n +\tgit show HEAD --format=\"%B\" >actual &&\n -+\tgrep -f actual expected\n ++\ttest_cmp actual expected\n +'\n +\n test_done\n\n-- \ngitgitgadget\n"},{"id":"441252","messageId":"9f1b3dd6d0b2d3f22fe960b0c3aaa3d888d26c88.1637039888.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v4.git.1637039888.gitgitgadget@gmail.com","subject":"[PATCH v4 1/2] doc: git-format-patch: describe the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-16T05:18:07Z","receivedAt":"2021-11-16T05:54:18Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..be797d7a28f 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n \t\t [-n | --numbered | -N | --no-numbered]\n \t\t [--start-number ] [--numbered-files]\n \t\t [--in-reply-to=] [--suffix=.]\n-\t\t [--ignore-if-in-upstream]\n+\t\t [--ignore-if-in-upstream] [--always]\n \t\t [--cover-from-description=]\n \t\t [--rfc] [--subject-prefix=]\n \t\t [(--reroll-count|-v) ]\n@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.\n \tpatches being generated, and any patch that matches is\n \tignored.\n \n+--always::\n+\tInclude patches for commits that do not introduce any change,\n+\twhich are omitted by default.\n+\n --cover-from-description=::\n \tControls which parts of the cover letter will be automatically\n \tpopulated using the branch's description.\n-- \ngitgitgadget\n\n"},{"id":"441253","messageId":"b7e30c9b7abecdc871ddc38122ca042e940cb190.1637039888.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v4.git.1637039888.gitgitgadget@gmail.com","subject":"[PATCH v4 2/2] am: support --empty-commit option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-16T05:18:08Z","receivedAt":"2021-11-16T05:54:21Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 9 +++++\n builtin/am.c | 48 +++++++++++++++++++++++---\n t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 125 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..d8d3bf202d7 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--empty-commit=(die|skip|asis)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -63,6 +64,14 @@ OPTIONS\n --quoted-cr=::\n \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n+--empty-commit=(die|skip|asis)::\n+\tThe command usually errors out when seeing an input e-mail\n+\tmessage that lacks a patch. When this option is set to\n+\t'skip', skip such an e-mail message without outputting error.\n+\tWhen this option is set to 'asis', create an empty commit,\n+\trecording the contents of the e-mail message as its log.\n+\t'die' is specified by default.\n+\n -m::\n --message-id::\n \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..e7755c1377e 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -87,6 +87,12 @@ enum show_patch_type {\n \tSHOW_PATCH_DIFF = 1,\n };\n \n+enum empty_commit_action {\n+\tDIE_EMPTY_COMMIT = 0, /* output errors */\n+\tSKIP_EMPTY_COMMIT, /* skip without outputting errors */\n+\tASIS_EMPTY_COMMIT /* keep recording as empty commits */\n+};\n+\n struct am_state {\n \t/* state directory path */\n \tchar *dir;\n@@ -118,6 +124,7 @@ struct am_state {\n \tint message_id;\n \tint scissors; /* enum scissors_type */\n \tint quoted_cr; /* enum quoted_cr_action */\n+\tint empty_commit; /* enum empty_commit_action */\n \tstruct strvec git_apply_opts;\n \tconst char *resolvemsg;\n \tint committer_date_is_author_date;\n@@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n \treturn 0;\n }\n \n+static int am_option_parse_empty_commit(const struct option *opt,\n+\t\t\t\t const char *arg, int unset)\n+{\n+\tint *opt_value = opt->value;\n+\n+\tif (unset || !strcmp(arg, \"die\"))\n+\t\t*opt_value = DIE_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"skip\"))\n+\t\t*opt_value = SKIP_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"asis\"))\n+\t\t*opt_value = ASIS_EMPTY_COMMIT;\n+\telse\n+\t\treturn error(_(\"Invalid value for --empty-commit: %s\"), arg);\n+\n+\treturn 0;\n+}\n+\n /**\n * Returns path relative to the am_state directory.\n */\n@@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t\tgoto finish;\n \t}\n \n-\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n-\t}\n-\n \tstrbuf_addstr(&msg, \"\\n\\n\");\n \tstrbuf_addbuf(&msg, &mi.log_message);\n \tstrbuf_stripspace(&msg, 0);\n@@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n+\t\t\tif (state->empty_commit == SKIP_EMPTY_COMMIT)\n+\t\t\t\tgoto next;\n+\t\t\telse if (state->empty_commit == ASIS_EMPTY_COMMIT) {\n+\t\t\t\tif (run_applypatch_msg_hook(state))\n+\t\t\t\t\texit(1);\n+\t\t\t\telse\n+\t\t\t\t\tgoto commit;\n+\t\t\t} else if (state->empty_commit == DIE_EMPTY_COMMIT) {\n+\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\t\tdie_user_resolve(state);\n+\t\t\t}\n+\t\t}\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\t{ OPTION_CALLBACK, 0, \"empty-commit\", &state.empty_commit,\n+\t\t \"(die|skip|asis)\",\n+\t\t N_(\"specify how to handle empty patches\"),\n+\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..e657180c201 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,13 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1159,70 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'still output error with --empty-commit when meeting empty files' '\n+\ttest_must_fail git am --empty-commit=skip empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n+\tgit checkout empty-commit^ &&\n+\ttest_must_fail git am empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty-commit=die empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty-commit=die cover-letter.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply\n+'\n+\n+test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n+\tgit am --empty-commit=skip empty-commit.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit rev-parse empty-commit^ >expected &&\n+\tgit rev-parse HEAD >actual &&\n+\ttest_cmp expected actual &&\n+\n+\tgit am --empty-commit=skip cover-letter.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\ttest_cmp_rev empty-commit^ HEAD\n+'\n+\n+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n+\tgit am --empty-commit=asis empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected &&\n+\n+\tgit am --empty-commit=asis cover-letter.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\techo \"*** SUBJECT HERE ***\" &&\n+\t\techo &&\n+\t\techo \"*** BLURB HERE ***\" &&\n+\t\techo &&\n+\t\techo \"A U Thor (1):\" &&\n+\t\tprintf \" \" &&\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected\n+'\n+\n test_done\n-- \ngitgitgadget\n"},{"id":"441289","messageId":"23de56a6-5b41-d8be-d59c-5a4e025ccd73@gmail.com","threadId":"56877","inReplyTo":"b7e30c9b7abecdc871ddc38122ca042e940cb190.1637039888.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v4 2/2] am: support --empty-commit option to handle empty patches","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2021-11-16T10:07:31Z","receivedAt":"2021-11-16T10:07:54Z","isPatch":true,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Aleen\n\nThanks for working on this\n\nOn 16/11/2021 05:18, Aleen via GitGitGadget wrote:\n> From: Aleen \n> \n> Signed-off-by: Aleen \n> ---\n> Documentation/git-am.txt | 9 +++++\n> builtin/am.c | 48 +++++++++++++++++++++++---\n> t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++++++++++++\n> 3 files changed, 125 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\n> index 0a4a984dfde..d8d3bf202d7 100644\n> --- a/Documentation/git-am.txt\n> +++ b/Documentation/git-am.txt\n> @@ -16,6 +16,7 @@ SYNOPSIS\n> \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n> \t [--[no-]scissors] [-S[]] [--patch-format=]\n> \t [--quoted-cr=]\n> +\t [--empty-commit=(die|skip|asis)]\n> \t [( | )...]\n> 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n> \n> @@ -63,6 +64,14 @@ OPTIONS\n> --quoted-cr=::\n> \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n> \n> +--empty-commit=(die|skip|asis)::\n> +\tThe command usually errors out when seeing an input e-mail\n> +\tmessage that lacks a patch. When this option is set to\n> +\t'skip', skip such an e-mail message without outputting error.\n> +\tWhen this option is set to 'asis', create an empty commit,\n> +\trecording the contents of the e-mail message as its log.\n> +\t'die' is specified by default.\n\nThis feels sufficiently similar to the case of handling empty commits in \n'git rebase' that it is worth trying to have a similar user interface. \nOtherwise the two commands have two different option names doing more or \nless the same thing. 'git rebase' has --empty=[drop,keep,ask] where drop \nis the default. If am were to accept --empty=[drop,keep,die] it would \noffer a similar user experience.\n\nBest Wishes\n\nPhillip\n\n> -m::\n> --message-id::\n> \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\n> diff --git a/builtin/am.c b/builtin/am.c\n> index 8677ea2348a..e7755c1377e 100644\n> --- a/builtin/am.c\n> +++ b/builtin/am.c\n> @@ -87,6 +87,12 @@ enum show_patch_type {\n> \tSHOW_PATCH_DIFF = 1,\n> };\n> \n> +enum empty_commit_action {\n> +\tDIE_EMPTY_COMMIT = 0, /* output errors */\n> +\tSKIP_EMPTY_COMMIT, /* skip without outputting errors */\n> +\tASIS_EMPTY_COMMIT /* keep recording as empty commits */\n> +};\n> +\n> struct am_state {\n> \t/* state directory path */\n> \tchar *dir;\n> @@ -118,6 +124,7 @@ struct am_state {\n> \tint message_id;\n> \tint scissors; /* enum scissors_type */\n> \tint quoted_cr; /* enum quoted_cr_action */\n> +\tint empty_commit; /* enum empty_commit_action */\n> \tstruct strvec git_apply_opts;\n> \tconst char *resolvemsg;\n> \tint committer_date_is_author_date;\n> @@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n> \treturn 0;\n> }\n> \n> +static int am_option_parse_empty_commit(const struct option *opt,\n> +\t\t\t\t const char *arg, int unset)\n> +{\n> +\tint *opt_value = opt->value;\n> +\n> +\tif (unset || !strcmp(arg, \"die\"))\n> +\t\t*opt_value = DIE_EMPTY_COMMIT;\n> +\telse if (!strcmp(arg, \"skip\"))\n> +\t\t*opt_value = SKIP_EMPTY_COMMIT;\n> +\telse if (!strcmp(arg, \"asis\"))\n> +\t\t*opt_value = ASIS_EMPTY_COMMIT;\n> +\telse\n> +\t\treturn error(_(\"Invalid value for --empty-commit: %s\"), arg);\n> +\n> +\treturn 0;\n> +}\n> +\n> /**\n> * Returns path relative to the am_state directory.\n> */\n> @@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail)\n> \t\tgoto finish;\n> \t}\n> \n> -\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n> -\t\tprintf_ln(_(\"Patch is empty.\"));\n> -\t\tdie_user_resolve(state);\n> -\t}\n> -\n> \tstrbuf_addstr(&msg, \"\\n\\n\");\n> \tstrbuf_addbuf(&msg, &mi.log_message);\n> \tstrbuf_stripspace(&msg, 0);\n> @@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n> \t\tif (state->interactive && do_interactive(state))\n> \t\t\tgoto next;\n> \n> +\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n> +\t\t\tif (state->empty_commit == SKIP_EMPTY_COMMIT)\n> +\t\t\t\tgoto next;\n> +\t\t\telse if (state->empty_commit == ASIS_EMPTY_COMMIT) {\n> +\t\t\t\tif (run_applypatch_msg_hook(state))\n> +\t\t\t\t\texit(1);\n> +\t\t\t\telse\n> +\t\t\t\t\tgoto commit;\n> +\t\t\t} else if (state->empty_commit == DIE_EMPTY_COMMIT) {\n> +\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n> +\t\t\t\tdie_user_resolve(state);\n> +\t\t\t}\n> +\t\t}\n> +\n> \t\tif (run_applypatch_msg_hook(state))\n> \t\t\texit(1);\n> \n> @@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume)\n> \t\t\tdie_user_resolve(state);\n> \t\t}\n> \n> +commit:\n> \t\tdo_commit(state);\n> \n> next:\n> @@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n> \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n> \t\t N_(\"GPG-sign commits\"),\n> \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n> +\t\t{ OPTION_CALLBACK, 0, \"empty-commit\", &state.empty_commit,\n> +\t\t \"(die|skip|asis)\",\n> +\t\t N_(\"specify how to handle empty patches\"),\n> +\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n> \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n> \t\t\tN_(\"(internal use for git-rebase)\")),\n> \t\tOPT_END()\n> diff --git a/t/t4150-am.sh b/t/t4150-am.sh\n> index 2aaaa0d7ded..e657180c201 100755\n> --- a/t/t4150-am.sh\n> +++ b/t/t4150-am.sh\n> @@ -196,6 +196,13 @@ test_expect_success setup '\n> \n> \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n> \n> +\tgit checkout -b empty-commit &&\n> +\tgit commit -m \"empty commit\" --allow-empty &&\n> +\n> +\tgit format-patch --stdout empty-commit^ >empty.patch &&\n> +\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n> +\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n> +\n> \t# reset time\n> \tsane_unset test_tick &&\n> \ttest_tick\n> @@ -1152,4 +1159,70 @@ test_expect_success 'apply binary blob in partial clone' '\n> \tgit -C client am ../patch\n> '\n> \n> +test_expect_success 'still output error with --empty-commit when meeting empty files' '\n> +\ttest_must_fail git am --empty-commit=skip empty.patch 2>actual &&\n> +\techo Patch format detection failed. >expected &&\n> +\ttest_cmp expected actual\n> +'\n> +\n> +test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n> +\tgit checkout empty-commit^ &&\n> +\ttest_must_fail git am empty-commit.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply &&\n> +\n> +\ttest_must_fail git am --empty-commit=die empty-commit.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply &&\n> +\n> +\ttest_must_fail git am --empty-commit=die cover-letter.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply\n> +'\n> +\n> +test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n> +\tgit am --empty-commit=skip empty-commit.patch >err &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\tgit rev-parse empty-commit^ >expected &&\n> +\tgit rev-parse HEAD >actual &&\n> +\ttest_cmp expected actual &&\n> +\n> +\tgit am --empty-commit=skip cover-letter.patch >err &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\ttest_cmp_rev empty-commit^ HEAD\n> +'\n> +\n> +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n> +\tgit am --empty-commit=asis empty-commit.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\t{\n> +\t\tgit show empty-commit --format=\"%B\" &&\n> +\t\techo \"--\" &&\n> +\t\tgit version | sed -e \"s/^git version //\" &&\n> +\t\techo\n> +\t} >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\ttest_cmp actual expected &&\n> +\n> +\tgit am --empty-commit=asis cover-letter.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\t{\n> +\t\techo \"*** SUBJECT HERE ***\" &&\n> +\t\techo &&\n> +\t\techo \"*** BLURB HERE ***\" &&\n> +\t\techo &&\n> +\t\techo \"A U Thor (1):\" &&\n> +\t\tprintf \" \" &&\n> +\t\tgit show empty-commit --format=\"%B\" &&\n> +\t\techo \"--\" &&\n> +\t\tgit version | sed -e \"s/^git version //\" &&\n> +\t\techo\n> +\t} >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\ttest_cmp actual expected\n> +'\n> +\n> test_done\n> \n"},{"id":"441291","messageId":"77268d7d.3ce.17d284d7732.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"23de56a6-5b41-d8be-d59c-5a4e025ccd73@gmail.com","subject":"Re: [PATCH v4 2/2] am: support --empty-commit option to handle empty patches","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-16T10:31:45Z","receivedAt":"2021-11-16T10:33:23Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"> > +--empty-commit=(die|skip|asis)::\n> > +\tThe command usually errors out when seeing an input e-mail\n> > +\tmessage that lacks a patch. When this option is set to\n> > +\t'skip', skip such an e-mail message without outputting error.\n> > +\tWhen this option is set to 'asis', create an empty commit,\n> > +\trecording the contents of the e-mail message as its log.\n> > +\t'die' is specified by default.\n> \n> This feels sufficiently similar to the case of handling empty commits in \n> 'git rebase' that it is worth trying to have a similar user interface. \n> Otherwise the two commands have two different option names doing more or \n> less the same thing. 'git rebase' has --empty=[drop,keep,ask] where drop \n> is the default. If am were to accept --empty=[drop,keep,die] it would \n> offer a similar user experience.\n> \n> Best Wishes\n> \n> Phillip\n\nDears Phillip,\n\nIt seems a good idea. Can Hamano make a decision?\n\nAleen\n"},{"id":"441414","messageId":"xmqqee7f41n7.fsf@gitster.g","threadId":"56877","inReplyTo":"23de56a6-5b41-d8be-d59c-5a4e025ccd73@gmail.com","subject":"Re: [PATCH v4 2/2] am: support --empty-commit option to handle empty patches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-17T08:39:08Z","receivedAt":"2021-11-17T08:39:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood writes:\n\n>> +--empty-commit=(die|skip|asis)::\n>> +\tThe command usually errors out when seeing an input e-mail\n>> +\tmessage that lacks a patch. When this option is set to\n>> +\t'skip', skip such an e-mail message without outputting error.\n>> +\tWhen this option is set to 'asis', create an empty commit,\n>> +\trecording the contents of the e-mail message as its log.\n>> +\t'die' is specified by default.\n>\n> This feels sufficiently similar to the case of handling empty commits\n> in 'git rebase' that it is worth trying to have a similar user\n> interface. Otherwise the two commands have two different option names\n> doing more or less the same thing. 'git rebase' has\n> --empty=[drop,keep,ask] where drop is the default. If am were to\n> accept --empty=[drop,keep,die] it would offer a similar user\n> experience.\n\nAh, thanks for noticing. I like the three words you suggest. If we\nalready have a similar option, we definitely should follow suit, and\nI think \"--empty\" would be a better fit than \"--empty-commit\" in the\ncontext of talking about the _input_ to \"am\".\n\n"},{"id":"441428","messageId":"pull.1076.v5.git.1637141636.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v4.git.1637039888.gitgitgadget@gmail.com","subject":"[PATCH v5 0/2] am: support --empty-commit=(die|skip|asis) option to am empty commits","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-17T09:33:54Z","receivedAt":"2021-11-17T09:34:01Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with an empty commit message, git-am should\nsupport applying and committing with empty patches.\n\n----------------------------------------------------------------------------\n\nChanges since v1:\n\n 1. add a case when not passing the --always option.\n 2. rename the --always option to --allow-empty.\n\n----------------------------------------------------------------------------\n\nChanges since v2:\n\n 1. rename the --allow-empty option to --empty-commit.\n 2. introduce three different strategies (die|skip|asis) when trying to\n record empty patches as empty commits.\n\n----------------------------------------------------------------------------\n\nChanges since v3:\n\n 1. generate the missed file for test cases.\n 2. grep -f cannot be used under Mac OS.\n\n----------------------------------------------------------------------------\n\nChanges since v4:\n\n 1. rename the --empty-commit option to --empty.\n 2. rename three different strategies (die|skip|asis) to die, drop and keep\n correspondingly.\n\n----------------------------------------------------------------------------\n\nAleen (2):\n doc: git-format-patch: describe the option --always\n am: support --empty option to handle empty patches\n\n Documentation/git-am.txt | 9 ++++\n Documentation/git-format-patch.txt | 6 ++-\n builtin/am.c | 48 ++++++++++++++++++--\n t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++\n 4 files changed, 130 insertions(+), 6 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v5\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v5\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n\nRange-diff vs v4:\n\n 1: 9f1b3dd6d0b = 1: 9f1b3dd6d0b doc: git-format-patch: describe the option --always\n 2: b7e30c9b7ab ! 2: 96d8573dc80 am: support --empty-commit option to handle empty patches\n @@ Metadata\n Author: Aleen \n \n ## Commit message ##\n - am: support --empty-commit option to handle empty patches\n + am: support --empty option to handle empty patches\n \n Signed-off-by: Aleen \n \n @@ Documentation/git-am.txt: SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n -+\t [--empty-commit=(die|skip|asis)]\n ++\t [--empty=(die|drop|keep)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n @@ Documentation/git-am.txt: OPTIONS\n --quoted-cr=::\n \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n -+--empty-commit=(die|skip|asis)::\n ++--empty-commit=(die|drop|keep)::\n +\tThe command usually errors out when seeing an input e-mail\n +\tmessage that lacks a patch. When this option is set to\n -+\t'skip', skip such an e-mail message without outputting error.\n -+\tWhen this option is set to 'asis', create an empty commit,\n ++\t'drop', skip such an e-mail message without outputting error.\n ++\tWhen this option is set to 'keep', create an empty commit,\n +\trecording the contents of the e-mail message as its log.\n +\t'die' is specified by default.\n +\n @@ builtin/am.c: enum show_patch_type {\n \tSHOW_PATCH_DIFF = 1,\n };\n \n -+enum empty_commit_action {\n ++enum empty_action {\n +\tDIE_EMPTY_COMMIT = 0, /* output errors */\n -+\tSKIP_EMPTY_COMMIT, /* skip without outputting errors */\n -+\tASIS_EMPTY_COMMIT /* keep recording as empty commits */\n ++\tDROP_EMPTY_COMMIT, /* skip without outputting errors */\n ++\tKEEP_EMPTY_COMMIT /* keep recording as empty commits */\n +};\n +\n struct am_state {\n @@ builtin/am.c: struct am_state {\n \tint message_id;\n \tint scissors; /* enum scissors_type */\n \tint quoted_cr; /* enum quoted_cr_action */\n -+\tint empty_commit; /* enum empty_commit_action */\n ++\tint empty_type; /* enum empty_action */\n \tstruct strvec git_apply_opts;\n \tconst char *resolvemsg;\n \tint committer_date_is_author_date;\n @@ builtin/am.c: static int am_option_parse_quoted_cr(const struct option *opt,\n +\n +\tif (unset || !strcmp(arg, \"die\"))\n +\t\t*opt_value = DIE_EMPTY_COMMIT;\n -+\telse if (!strcmp(arg, \"skip\"))\n -+\t\t*opt_value = SKIP_EMPTY_COMMIT;\n -+\telse if (!strcmp(arg, \"asis\"))\n -+\t\t*opt_value = ASIS_EMPTY_COMMIT;\n ++\telse if (!strcmp(arg, \"drop\"))\n ++\t\t*opt_value = DROP_EMPTY_COMMIT;\n ++\telse if (!strcmp(arg, \"keep\"))\n ++\t\t*opt_value = KEEP_EMPTY_COMMIT;\n +\telse\n -+\t\treturn error(_(\"Invalid value for --empty-commit: %s\"), arg);\n ++\t\treturn error(_(\"Invalid value for --empty: %s\"), arg);\n +\n +\treturn 0;\n +}\n @@ builtin/am.c: static void am_run(struct am_state *state, int resume)\n \t\t\tgoto next;\n \n +\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n -+\t\t\tif (state->empty_commit == SKIP_EMPTY_COMMIT)\n ++\t\t\tif (state->empty_type == DROP_EMPTY_COMMIT)\n +\t\t\t\tgoto next;\n -+\t\t\telse if (state->empty_commit == ASIS_EMPTY_COMMIT) {\n ++\t\t\telse if (state->empty_type == KEEP_EMPTY_COMMIT) {\n +\t\t\t\tif (run_applypatch_msg_hook(state))\n +\t\t\t\t\texit(1);\n +\t\t\t\telse\n +\t\t\t\t\tgoto commit;\n -+\t\t\t} else if (state->empty_commit == DIE_EMPTY_COMMIT) {\n ++\t\t\t} else if (state->empty_type == DIE_EMPTY_COMMIT) {\n +\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n +\t\t\t\tdie_user_resolve(state);\n +\t\t\t}\n @@ builtin/am.c: int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n -+\t\t{ OPTION_CALLBACK, 0, \"empty-commit\", &state.empty_commit,\n -+\t\t \"(die|skip|asis)\",\n ++\t\t{ OPTION_CALLBACK, 0, \"empty\", &state.empty_type,\n ++\t\t \"(die|drop|keep)\",\n +\t\t N_(\"specify how to handle empty patches\"),\n +\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n @@ t/t4150-am.sh: test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n -+test_expect_success 'still output error with --empty-commit when meeting empty files' '\n -+\ttest_must_fail git am --empty-commit=skip empty.patch 2>actual &&\n ++test_expect_success 'still output error with --empty when meeting empty files' '\n ++\ttest_must_fail git am --empty=drop empty.patch 2>actual &&\n +\techo Patch format detection failed. >expected &&\n +\ttest_cmp expected actual\n +'\n @@ t/t4150-am.sh: test_expect_success 'apply binary blob in partial clone' '\n +\ttest_i18ngrep \"Patch is empty.\" err &&\n +\trm -fr .git/rebase-apply &&\n +\n -+\ttest_must_fail git am --empty-commit=die empty-commit.patch >err &&\n ++\ttest_must_fail git am --empty=die empty-commit.patch >err &&\n +\ttest_path_is_dir .git/rebase-apply &&\n +\ttest_i18ngrep \"Patch is empty.\" err &&\n +\trm -fr .git/rebase-apply &&\n +\n -+\ttest_must_fail git am --empty-commit=die cover-letter.patch >err &&\n ++\ttest_must_fail git am --empty=die cover-letter.patch >err &&\n +\ttest_path_is_dir .git/rebase-apply &&\n +\ttest_i18ngrep \"Patch is empty.\" err &&\n +\trm -fr .git/rebase-apply\n +'\n +\n +test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n -+\tgit am --empty-commit=skip empty-commit.patch >err &&\n ++\tgit am --empty=drop empty-commit.patch >err &&\n +\ttest_path_is_missing .git/rebase-apply &&\n +\tgit rev-parse empty-commit^ >expected &&\n +\tgit rev-parse HEAD >actual &&\n +\ttest_cmp expected actual &&\n +\n -+\tgit am --empty-commit=skip cover-letter.patch >err &&\n ++\tgit am --empty=drop cover-letter.patch >err &&\n +\ttest_path_is_missing .git/rebase-apply &&\n +\ttest_cmp_rev empty-commit^ HEAD\n +'\n +\n +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n -+\tgit am --empty-commit=asis empty-commit.patch &&\n ++\tgit am --empty=keep empty-commit.patch &&\n +\ttest_path_is_missing .git/rebase-apply &&\n +\t{\n +\t\tgit show empty-commit --format=\"%B\" &&\n @@ t/t4150-am.sh: test_expect_success 'apply binary blob in partial clone' '\n +\tgit show HEAD --format=\"%B\" >actual &&\n +\ttest_cmp actual expected &&\n +\n -+\tgit am --empty-commit=asis cover-letter.patch &&\n ++\tgit am --empty=keep cover-letter.patch &&\n +\ttest_path_is_missing .git/rebase-apply &&\n +\t{\n +\t\techo \"*** SUBJECT HERE ***\" &&\n\n-- \ngitgitgadget\n"},{"id":"441429","messageId":"9f1b3dd6d0b2d3f22fe960b0c3aaa3d888d26c88.1637141636.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v5.git.1637141636.gitgitgadget@gmail.com","subject":"[PATCH v5 1/2] doc: git-format-patch: describe the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-17T09:33:55Z","receivedAt":"2021-11-17T09:34:02Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..be797d7a28f 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n \t\t [-n | --numbered | -N | --no-numbered]\n \t\t [--start-number ] [--numbered-files]\n \t\t [--in-reply-to=] [--suffix=.]\n-\t\t [--ignore-if-in-upstream]\n+\t\t [--ignore-if-in-upstream] [--always]\n \t\t [--cover-from-description=]\n \t\t [--rfc] [--subject-prefix=]\n \t\t [(--reroll-count|-v) ]\n@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.\n \tpatches being generated, and any patch that matches is\n \tignored.\n \n+--always::\n+\tInclude patches for commits that do not introduce any change,\n+\twhich are omitted by default.\n+\n --cover-from-description=::\n \tControls which parts of the cover letter will be automatically\n \tpopulated using the branch's description.\n-- \ngitgitgadget\n\n"},{"id":"441430","messageId":"96d8573dc808bc32990842675ca32a0d1e8a8cef.1637141636.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v5.git.1637141636.gitgitgadget@gmail.com","subject":"[PATCH v5 2/2] am: support --empty option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-17T09:33:56Z","receivedAt":"2021-11-17T09:34:06Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 9 +++++\n builtin/am.c | 48 +++++++++++++++++++++++---\n t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 125 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..665bc89ca9f 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--empty=(die|drop|keep)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -63,6 +64,14 @@ OPTIONS\n --quoted-cr=::\n \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n+--empty-commit=(die|drop|keep)::\n+\tThe command usually errors out when seeing an input e-mail\n+\tmessage that lacks a patch. When this option is set to\n+\t'drop', skip such an e-mail message without outputting error.\n+\tWhen this option is set to 'keep', create an empty commit,\n+\trecording the contents of the e-mail message as its log.\n+\t'die' is specified by default.\n+\n -m::\n --message-id::\n \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..1a3ed87b445 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -87,6 +87,12 @@ enum show_patch_type {\n \tSHOW_PATCH_DIFF = 1,\n };\n \n+enum empty_action {\n+\tDIE_EMPTY_COMMIT = 0, /* output errors */\n+\tDROP_EMPTY_COMMIT, /* skip without outputting errors */\n+\tKEEP_EMPTY_COMMIT /* keep recording as empty commits */\n+};\n+\n struct am_state {\n \t/* state directory path */\n \tchar *dir;\n@@ -118,6 +124,7 @@ struct am_state {\n \tint message_id;\n \tint scissors; /* enum scissors_type */\n \tint quoted_cr; /* enum quoted_cr_action */\n+\tint empty_type; /* enum empty_action */\n \tstruct strvec git_apply_opts;\n \tconst char *resolvemsg;\n \tint committer_date_is_author_date;\n@@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n \treturn 0;\n }\n \n+static int am_option_parse_empty_commit(const struct option *opt,\n+\t\t\t\t const char *arg, int unset)\n+{\n+\tint *opt_value = opt->value;\n+\n+\tif (unset || !strcmp(arg, \"die\"))\n+\t\t*opt_value = DIE_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"drop\"))\n+\t\t*opt_value = DROP_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"keep\"))\n+\t\t*opt_value = KEEP_EMPTY_COMMIT;\n+\telse\n+\t\treturn error(_(\"Invalid value for --empty: %s\"), arg);\n+\n+\treturn 0;\n+}\n+\n /**\n * Returns path relative to the am_state directory.\n */\n@@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t\tgoto finish;\n \t}\n \n-\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n-\t}\n-\n \tstrbuf_addstr(&msg, \"\\n\\n\");\n \tstrbuf_addbuf(&msg, &mi.log_message);\n \tstrbuf_stripspace(&msg, 0);\n@@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n+\t\t\tif (state->empty_type == DROP_EMPTY_COMMIT)\n+\t\t\t\tgoto next;\n+\t\t\telse if (state->empty_type == KEEP_EMPTY_COMMIT) {\n+\t\t\t\tif (run_applypatch_msg_hook(state))\n+\t\t\t\t\texit(1);\n+\t\t\t\telse\n+\t\t\t\t\tgoto commit;\n+\t\t\t} else if (state->empty_type == DIE_EMPTY_COMMIT) {\n+\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\t\tdie_user_resolve(state);\n+\t\t\t}\n+\t\t}\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\t{ OPTION_CALLBACK, 0, \"empty\", &state.empty_type,\n+\t\t \"(die|drop|keep)\",\n+\t\t N_(\"specify how to handle empty patches\"),\n+\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..3119556884d 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,13 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1159,70 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'still output error with --empty when meeting empty files' '\n+\ttest_must_fail git am --empty=drop empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n+\tgit checkout empty-commit^ &&\n+\ttest_must_fail git am empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty=die empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty=die cover-letter.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply\n+'\n+\n+test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n+\tgit am --empty=drop empty-commit.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit rev-parse empty-commit^ >expected &&\n+\tgit rev-parse HEAD >actual &&\n+\ttest_cmp expected actual &&\n+\n+\tgit am --empty=drop cover-letter.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\ttest_cmp_rev empty-commit^ HEAD\n+'\n+\n+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n+\tgit am --empty=keep empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected &&\n+\n+\tgit am --empty=keep cover-letter.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\techo \"*** SUBJECT HERE ***\" &&\n+\t\techo &&\n+\t\techo \"*** BLURB HERE ***\" &&\n+\t\techo &&\n+\t\techo \"A U Thor (1):\" &&\n+\t\tprintf \" \" &&\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected\n+'\n+\n test_done\n-- \ngitgitgadget\n"},{"id":"441592","messageId":"9f1b3dd6d0b2d3f22fe960b0c3aaa3d888d26c88.1637232636.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","subject":"[PATCH v6 1/3] doc: git-format-patch: describe the option --always","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-18T10:50:34Z","receivedAt":"2021-11-18T10:51:05Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-format-patch.txt | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 113eabc107c..be797d7a28f 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -18,7 +18,7 @@ SYNOPSIS\n \t\t [-n | --numbered | -N | --no-numbered]\n \t\t [--start-number ] [--numbered-files]\n \t\t [--in-reply-to=] [--suffix=.]\n-\t\t [--ignore-if-in-upstream]\n+\t\t [--ignore-if-in-upstream] [--always]\n \t\t [--cover-from-description=]\n \t\t [--rfc] [--subject-prefix=]\n \t\t [(--reroll-count|-v) ]\n@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.\n \tpatches being generated, and any patch that matches is\n \tignored.\n \n+--always::\n+\tInclude patches for commits that do not introduce any change,\n+\twhich are omitted by default.\n+\n --cover-from-description=::\n \tControls which parts of the cover letter will be automatically\n \tpopulated using the branch's description.\n-- \ngitgitgadget\n\n"},{"id":"441593","messageId":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v5.git.1637141636.gitgitgadget@gmail.com","subject":"[PATCH v6 0/3] am: support --empty=(die|drop|keep) option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-18T10:50:33Z","receivedAt":"2021-11-18T10:51:10Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with an empty commit message, git-am should\nsupport applying and committing with empty patches.\n\n----------------------------------------------------------------------------\n\nChanges since v1:\n\n 1. add a case when not passing the --always option.\n 2. rename the --always option to --allow-empty.\n\n----------------------------------------------------------------------------\n\nChanges since v2:\n\n 1. rename the --allow-empty option to --empty-commit.\n 2. introduce three different strategies (die|skip|asis) when trying to\n record empty patches as empty commits.\n\n----------------------------------------------------------------------------\n\nChanges since v3:\n\n 1. generate the missed file for test cases.\n 2. grep -f cannot be used under Mac OS.\n\n----------------------------------------------------------------------------\n\nChanges since v4:\n\n 1. rename the --empty-commit option to --empty.\n 2. rename three different strategies (die|skip|asis) to die, drop and keep\n correspondingly.\n\n----------------------------------------------------------------------------\n\nChanges since v5:\n\n 1. throw an error when passing --empty option without value.\n\n----------------------------------------------------------------------------\n\nAleen (3):\n doc: git-format-patch: describe the option --always\n am: support --empty option to handle empty patches\n am: throw an error when passing --empty option without value\n\n Documentation/git-am.txt | 9 ++++\n Documentation/git-format-patch.txt | 6 ++-\n builtin/am.c | 49 ++++++++++++++++--\n t/t4150-am.sh | 79 ++++++++++++++++++++++++++++++\n 4 files changed, 137 insertions(+), 6 deletions(-)\n\n\nbase-commit: b550198c73edd4cc058832dcf74b41aeec2adba2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v6\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v6\nPull-Request: https://github.com/gitgitgadget/git/pull/1076\n\nRange-diff vs v5:\n\n 1: 9f1b3dd6d0b = 1: 9f1b3dd6d0b doc: git-format-patch: describe the option --always\n 2: 96d8573dc80 = 2: 96d8573dc80 am: support --empty option to handle empty patches\n -: ----------- > 3: e907a2b2faa am: throw an error when passing --empty option without value\n\n-- \ngitgitgadget\n"},{"id":"441594","messageId":"96d8573dc808bc32990842675ca32a0d1e8a8cef.1637232636.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","subject":"[PATCH v6 2/3] am: support --empty option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-18T10:50:35Z","receivedAt":"2021-11-18T10:51:12Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n Documentation/git-am.txt | 9 +++++\n builtin/am.c | 48 +++++++++++++++++++++++---\n t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 125 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 0a4a984dfde..665bc89ca9f 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -16,6 +16,7 @@ SYNOPSIS\n \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n \t [--[no-]scissors] [-S[]] [--patch-format=]\n \t [--quoted-cr=]\n+\t [--empty=(die|drop|keep)]\n \t [( | )...]\n 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n \n@@ -63,6 +64,14 @@ OPTIONS\n --quoted-cr=::\n \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n \n+--empty-commit=(die|drop|keep)::\n+\tThe command usually errors out when seeing an input e-mail\n+\tmessage that lacks a patch. When this option is set to\n+\t'drop', skip such an e-mail message without outputting error.\n+\tWhen this option is set to 'keep', create an empty commit,\n+\trecording the contents of the e-mail message as its log.\n+\t'die' is specified by default.\n+\n -m::\n --message-id::\n \tPass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 8677ea2348a..1a3ed87b445 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -87,6 +87,12 @@ enum show_patch_type {\n \tSHOW_PATCH_DIFF = 1,\n };\n \n+enum empty_action {\n+\tDIE_EMPTY_COMMIT = 0, /* output errors */\n+\tDROP_EMPTY_COMMIT, /* skip without outputting errors */\n+\tKEEP_EMPTY_COMMIT /* keep recording as empty commits */\n+};\n+\n struct am_state {\n \t/* state directory path */\n \tchar *dir;\n@@ -118,6 +124,7 @@ struct am_state {\n \tint message_id;\n \tint scissors; /* enum scissors_type */\n \tint quoted_cr; /* enum quoted_cr_action */\n+\tint empty_type; /* enum empty_action */\n \tstruct strvec git_apply_opts;\n \tconst char *resolvemsg;\n \tint committer_date_is_author_date;\n@@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n \treturn 0;\n }\n \n+static int am_option_parse_empty_commit(const struct option *opt,\n+\t\t\t\t const char *arg, int unset)\n+{\n+\tint *opt_value = opt->value;\n+\n+\tif (unset || !strcmp(arg, \"die\"))\n+\t\t*opt_value = DIE_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"drop\"))\n+\t\t*opt_value = DROP_EMPTY_COMMIT;\n+\telse if (!strcmp(arg, \"keep\"))\n+\t\t*opt_value = KEEP_EMPTY_COMMIT;\n+\telse\n+\t\treturn error(_(\"Invalid value for --empty: %s\"), arg);\n+\n+\treturn 0;\n+}\n+\n /**\n * Returns path relative to the am_state directory.\n */\n@@ -1248,11 +1272,6 @@ static int parse_mail(struct am_state *state, const char *mail)\n \t\tgoto finish;\n \t}\n \n-\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n-\t\tprintf_ln(_(\"Patch is empty.\"));\n-\t\tdie_user_resolve(state);\n-\t}\n-\n \tstrbuf_addstr(&msg, \"\\n\\n\");\n \tstrbuf_addbuf(&msg, &mi.log_message);\n \tstrbuf_stripspace(&msg, 0);\n@@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n \t\tif (state->interactive && do_interactive(state))\n \t\t\tgoto next;\n \n+\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n+\t\t\tif (state->empty_type == DROP_EMPTY_COMMIT)\n+\t\t\t\tgoto next;\n+\t\t\telse if (state->empty_type == KEEP_EMPTY_COMMIT) {\n+\t\t\t\tif (run_applypatch_msg_hook(state))\n+\t\t\t\t\texit(1);\n+\t\t\t\telse\n+\t\t\t\t\tgoto commit;\n+\t\t\t} else if (state->empty_type == DIE_EMPTY_COMMIT) {\n+\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n+\t\t\t\tdie_user_resolve(state);\n+\t\t\t}\n+\t\t}\n+\n \t\tif (run_applypatch_msg_hook(state))\n \t\t\texit(1);\n \n@@ -1827,6 +1860,7 @@ static void am_run(struct am_state *state, int resume)\n \t\t\tdie_user_resolve(state);\n \t\t}\n \n+commit:\n \t\tdo_commit(state);\n \n next:\n@@ -2357,6 +2391,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n+\t\t{ OPTION_CALLBACK, 0, \"empty\", &state.empty_type,\n+\t\t \"(die|drop|keep)\",\n+\t\t N_(\"specify how to handle empty patches\"),\n+\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 2aaaa0d7ded..3119556884d 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -196,6 +196,13 @@ test_expect_success setup '\n \n \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n \n+\tgit checkout -b empty-commit &&\n+\tgit commit -m \"empty commit\" --allow-empty &&\n+\n+\tgit format-patch --stdout empty-commit^ >empty.patch &&\n+\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n+\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n+\n \t# reset time\n \tsane_unset test_tick &&\n \ttest_tick\n@@ -1152,4 +1159,70 @@ test_expect_success 'apply binary blob in partial clone' '\n \tgit -C client am ../patch\n '\n \n+test_expect_success 'still output error with --empty when meeting empty files' '\n+\ttest_must_fail git am --empty=drop empty.patch 2>actual &&\n+\techo Patch format detection failed. >expected &&\n+\ttest_cmp expected actual\n+'\n+\n+test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n+\tgit checkout empty-commit^ &&\n+\ttest_must_fail git am empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty=die empty-commit.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply &&\n+\n+\ttest_must_fail git am --empty=die cover-letter.patch >err &&\n+\ttest_path_is_dir .git/rebase-apply &&\n+\ttest_i18ngrep \"Patch is empty.\" err &&\n+\trm -fr .git/rebase-apply\n+'\n+\n+test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n+\tgit am --empty=drop empty-commit.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\tgit rev-parse empty-commit^ >expected &&\n+\tgit rev-parse HEAD >actual &&\n+\ttest_cmp expected actual &&\n+\n+\tgit am --empty=drop cover-letter.patch >err &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\ttest_cmp_rev empty-commit^ HEAD\n+'\n+\n+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n+\tgit am --empty=keep empty-commit.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected &&\n+\n+\tgit am --empty=keep cover-letter.patch &&\n+\ttest_path_is_missing .git/rebase-apply &&\n+\t{\n+\t\techo \"*** SUBJECT HERE ***\" &&\n+\t\techo &&\n+\t\techo \"*** BLURB HERE ***\" &&\n+\t\techo &&\n+\t\techo \"A U Thor (1):\" &&\n+\t\tprintf \" \" &&\n+\t\tgit show empty-commit --format=\"%B\" &&\n+\t\techo \"--\" &&\n+\t\tgit version | sed -e \"s/^git version //\" &&\n+\t\techo\n+\t} >expected &&\n+\tgit show HEAD --format=\"%B\" >actual &&\n+\ttest_cmp actual expected\n+'\n+\n test_done\n-- \ngitgitgadget\n\n"},{"id":"441595","messageId":"e907a2b2faa1e3c5854504c23cc6e118c2125817.1637232636.git.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","subject":"[PATCH v6 3/3] am: throw an error when passing --empty option without value","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-18T10:50:36Z","receivedAt":"2021-11-18T10:51:13Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"From: Aleen \n\nSigned-off-by: Aleen \n---\n builtin/am.c | 13 +++++++------\n t/t4150-am.sh | 8 +++++++-\n 2 files changed, 14 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin/am.c b/builtin/am.c\nindex 1a3ed87b445..5d487b5256b 100644\n--- a/builtin/am.c\n+++ b/builtin/am.c\n@@ -185,12 +185,14 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n \treturn 0;\n }\n \n-static int am_option_parse_empty_commit(const struct option *opt,\n+static int am_option_parse_empty(const struct option *opt,\n \t\t\t\t const char *arg, int unset)\n {\n \tint *opt_value = opt->value;\n \n-\tif (unset || !strcmp(arg, \"die\"))\n+\tBUG_ON_OPT_NEG(unset);\n+\n+\tif (!strcmp(arg, \"die\"))\n \t\t*opt_value = DIE_EMPTY_COMMIT;\n \telse if (!strcmp(arg, \"drop\"))\n \t\t*opt_value = DROP_EMPTY_COMMIT;\n@@ -2391,10 +2393,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n \t\t N_(\"GPG-sign commits\"),\n \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n-\t\t{ OPTION_CALLBACK, 0, \"empty\", &state.empty_type,\n-\t\t \"(die|drop|keep)\",\n-\t\t N_(\"specify how to handle empty patches\"),\n-\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n+\t\tOPT_CALLBACK_F(0, \"empty\", &state.empty_type, \"{drop,keep,die}\",\n+\t\t N_(\"how to handle empty patches\"),\n+\t\t PARSE_OPT_NONEG, am_option_parse_empty),\n \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n \t\t\tN_(\"(internal use for git-rebase)\")),\n \t\tOPT_END()\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 3119556884d..c32d21e80da 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -1165,8 +1165,14 @@ test_expect_success 'still output error with --empty when meeting empty files' '\n \ttest_cmp expected actual\n '\n \n-test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n+test_expect_success 'invalid when passing no value for the --empty option' '\n \tgit checkout empty-commit^ &&\n+\ttest_must_fail git am --empty empty-commit.patch 2>err &&\n+\techo \"error: Invalid value for --empty: empty-commit.patch\" >expected &&\n+\ttest_cmp expected err\n+'\n+\n+test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n \ttest_must_fail git am empty-commit.patch >err &&\n \ttest_path_is_dir .git/rebase-apply &&\n \ttest_i18ngrep \"Patch is empty.\" err &&\n-- \ngitgitgadget\n"},{"id":"441675","messageId":"xmqqilwpuiv4.fsf@gitster.g","threadId":"56877","inReplyTo":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","subject":"Re: [PATCH v6 0/3] am: support --empty=(die|drop|keep) option to handle empty patches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-18T23:47:11Z","receivedAt":"2021-11-18T23:47:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\nAs per https://git-scm.com/docs/SubmittingPatches#sign-off:\n\n Please don’t hide your real name.\n\nI suspect your real name is not Aleen, but something with x and w in\nit.\n\n\n"},{"id":"441679","messageId":"xmqqwnl5rmi3.fsf@gitster.g","threadId":"56877","inReplyTo":"96d8573dc808bc32990842675ca32a0d1e8a8cef.1637232636.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v6 2/3] am: support --empty option to handle empty patches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-19T00:56:52Z","receivedAt":"2021-11-19T00:56:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aleen via GitGitGadget\" writes:\n\n> From: Aleen \n\nHere is a place to explain to readers what it exactly means to\n\"support --empty option to handle empty patches\". You know what you\nmeant, I happen to know what you meant because I haven't forgotten\nyet, but we are writing for developers in the future who need to fix\nbugs in 6 months down the road to decide if this commit is involved\nin the bug in \"git am\" they are hunting.\n\n> Signed-off-by: Aleen \n> ---\n> Documentation/git-am.txt | 9 +++++\n> builtin/am.c | 48 +++++++++++++++++++++++---\n> t/t4150-am.sh | 73 ++++++++++++++++++++++++++++++++++++++++\n> 3 files changed, 125 insertions(+), 5 deletions(-)\n>\n> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\n> index 0a4a984dfde..665bc89ca9f 100644\n> --- a/Documentation/git-am.txt\n> +++ b/Documentation/git-am.txt\n> @@ -16,6 +16,7 @@ SYNOPSIS\n> \t [--exclude=] [--include=] [--reject] [-q | --quiet]\n> \t [--[no-]scissors] [-S[]] [--patch-format=]\n> \t [--quoted-cr=]\n> +\t [--empty=(die|drop|keep)]\n> \t [( | )...]\n> 'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n> \n> @@ -63,6 +64,14 @@ OPTIONS\n> --quoted-cr=::\n> \tThis flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).\n> \n> +--empty-commit=(die|drop|keep)::\n> +\tThe command usually errors out when seeing an input e-mail\n> +\tmessage that lacks a patch. When this option is set to\n> +\t'drop', skip such an e-mail message without outputting error.\n\n\"without outputting error\" -> \"instead\".\n\nThe first sentence used \"to error\" as a verb to mean \"stop the\noperation in the middle with a message that diagnoses what is\nwrong\". Saying \"outputting error\" to use the same word as a noun is\nnot a good idea, especially the use of verb \"to output\", as it makes\nthe word \"error\" look as if it is only the \"message\" part, and it\nbecomes unclear if the \"stopping due to an error\" is also skipped.\n\nI actually think it makes sense to give a notice/info message when\n\"drop\" skips an empty patch, unless \"--quiet\" is given.\n\n> +\tWhen this option is set to 'keep', create an empty commit,\n> +\trecording the contents of the e-mail message as its log.\n> +\t'die' is specified by default.\n\n\"is specified by default\" sounds a bit strange. Perhaps lose the\nlast sentence, and update the first line like so:\n\n By default, or when the option is set to 'die', the command\n errors out on an input e-mail message that lacks a patch.\n\n> diff --git a/builtin/am.c b/builtin/am.c\n> index 8677ea2348a..1a3ed87b445 100644\n> --- a/builtin/am.c\n> +++ b/builtin/am.c\n> @@ -87,6 +87,12 @@ enum show_patch_type {\n> \tSHOW_PATCH_DIFF = 1,\n> };\n> \n> +enum empty_action {\n> +\tDIE_EMPTY_COMMIT = 0, /* output errors */\n> +\tDROP_EMPTY_COMMIT, /* skip without outputting errors */\n\nI think the user deserves \"info:\" (unless \"--quiet\").\n\n> +\tKEEP_EMPTY_COMMIT /* keep recording as empty commits */\n> +};\n> +\n> struct am_state {\n> \t/* state directory path */\n> \tchar *dir;\n> @@ -118,6 +124,7 @@ struct am_state {\n> \tint message_id;\n> \tint scissors; /* enum scissors_type */\n> \tint quoted_cr; /* enum quoted_cr_action */\n> +\tint empty_type; /* enum empty_action */\n> \tstruct strvec git_apply_opts;\n> \tconst char *resolvemsg;\n> \tint committer_date_is_author_date;\n> @@ -178,6 +185,23 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n> \treturn 0;\n> }\n> \n> +static int am_option_parse_empty_commit(const struct option *opt,\n> +\t\t\t\t const char *arg, int unset)\n> +{\n> +\tint *opt_value = opt->value;\n> +\n> +\tif (unset || !strcmp(arg, \"die\"))\n> +\t\t*opt_value = DIE_EMPTY_COMMIT;\n> +\telse if (!strcmp(arg, \"drop\"))\n> +\t\t*opt_value = DROP_EMPTY_COMMIT;\n> +\telse if (!strcmp(arg, \"keep\"))\n> +\t\t*opt_value = KEEP_EMPTY_COMMIT;\n> +\telse\n> +\t\treturn error(_(\"Invalid value for --empty: %s\"), arg);\n> +\n> +\treturn 0;\n> +}\n\nOK.\n\n> @@ -1792,6 +1811,20 @@ static void am_run(struct am_state *state, int resume)\n> \t\tif (state->interactive && do_interactive(state))\n> \t\t\tgoto next;\n> \n> +\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n> +\t\t\tif (state->empty_type == DROP_EMPTY_COMMIT)\n> +\t\t\t\tgoto next;\n> +\t\t\telse if (state->empty_type == KEEP_EMPTY_COMMIT) {\n> +\t\t\t\tif (run_applypatch_msg_hook(state))\n> +\t\t\t\t\texit(1);\n> +\t\t\t\telse\n> +\t\t\t\t\tgoto commit;\n\nIt probably is easier to read without \"else\", i.e.\n\n\t\t\telse if (state->empty_type == KEEP_EMPTY_COMMIT) {\n\t\t\t\tif (run_applypatch_msg_hook(state))\n\t\t\t\t\texit(1);\n\t\t\t\tgoto commit;\n\nRunning hook here and outside this if() block a bit ugly. Can't we\ninstead set a flag variable or something and let the existing call\nto run_applypatch_msg_hook() used?\n\n> +\t\t\t} else if (state->empty_type == DIE_EMPTY_COMMIT) {\n> +\t\t\t\tprintf_ln(_(\"Patch is empty.\"));\n> +\t\t\t\tdie_user_resolve(state);\n> +\t\t\t}\n\nAlso, if developers ever add another possible value for the\nstate->empty_type member (by the way, \"empty\" in its name is good,\nbut \"type\" is iffy), it would be a bug if they do not consider what\nshould happen inside this \"if (is_empty_or_missing_file())\" block,\nno? In such a case, instead of if/else if/... cascade, consider\nusing switch(). Taking them together.\n \n\twhile (state->cur <= state->last) {\n \tconst char *mail = am_path(state, msgnum(state));\n\t\tint apply_status;\n\t\tint to_keep;\n\t\t...\n\t\tto_keep = 0;\n\t\tif (is_empty_or_missing_file(am_path(state, \"patch\"))) {\n\t\t\tswitch (state->empty_type) {\n\t\t\tcase DROP_EMPTY_COMMIT:\n say(state, stdout, _(\"Skipping empty patch '%.*s\",\n\t\t\t\t\tlinelen(state->msg0, state->msg);\n\t\t\t\tgoto next;\n\t\t\t\tbreak;\n\t\t\tcase KEEP_EMPTY_COMMIT:\n\t\t\t\tto_keep = 1;\n\t\t\t\tbreak;\n\t\t\tcase DIE_EMPTY_COMMIT:\n\t\t\t\tpritnf_ln(_(\"Patch is empty.\"));\n\t\t\t\tdie_user_resolve(state);\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\n\t\tif (run_applypatch_msg_hook(state))\n\t\t\texit(1);\n\t\tif (to_keep)\n\t\t\tgoto commit; /* empty: just record a message */\n\nor something like that.\n\n> diff --git a/t/t4150-am.sh b/t/t4150-am.sh\n> index 2aaaa0d7ded..3119556884d 100755\n> --- a/t/t4150-am.sh\n> +++ b/t/t4150-am.sh\n> @@ -196,6 +196,13 @@ test_expect_success setup '\n> \n> \tgit format-patch -M --stdout lorem^ >rename-add.patch &&\n> \n> +\tgit checkout -b empty-commit &&\n> +\tgit commit -m \"empty commit\" --allow-empty &&\n> +\n> +\tgit format-patch --stdout empty-commit^ >empty.patch &&\n\nUnless this is a test for \"format-patch\" command to make sure that\nthe above command will not output a single byte, I would rather see\nthe above line written like this:\n\n\t: >empty.patch &&\n\n> +\tgit format-patch --stdout --cover-letter empty-commit^ >cover-letter.patch &&\n\nThis only creates a cover letter without anything, which sort of\nlooks like an empty commit.\n\n> +\tgit format-patch --always --stdout empty-commit^ >empty-commit.patch &&\n\nAnd this gives another empty patch with only a message.\n\nI would sort-of understand if there is\n\n\tgit format-patch --stdout --always --cover-letter HEAD^ >both.patch\n\nthat has two e-mail messages in it, but what's the significance of\ntesting both cover-letter.patch and empty-commit.patch?\n\nThe receiving end would not care what's in the actual e-mail\nmessage, as long as it lacks the patch part, no? Or am I missing\nsome subtle reason why we want to test both?\n\n> @@ -1152,4 +1159,70 @@ test_expect_success 'apply binary blob in partial clone' '\n> \tgit -C client am ../patch\n> '\n> \n> +test_expect_success 'still output error with --empty when meeting empty files' '\n> +\ttest_must_fail git am --empty=drop empty.patch 2>actual &&\n\nNobody will understand \"still\", unless they know it used to be\nunconditionally a failure to feed an e-mail message that lacks a\npatch.\n\ntest_expect_success 'An empty input file is error regardless of --empty option' '\n\nor something like that?\n\n> +\techo Patch format detection failed. >expected &&\n> +\ttest_cmp expected actual\n> +'\n> +\n> +test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n> +\tgit checkout empty-commit^ &&\n> +\ttest_must_fail git am empty-commit.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply &&\n\nIf any command before \"rm\" fails, it won't be cleaned up.\n\n test_expect_success 'a message without a patch is an error (default)' '\n\ttest_when_finished \"git am --abort || :\" &&\n\tgit checkout --detach empty-commit^ &&\n\ttest_must_fail git am empty-commit.patch >err &&\n\tgrep \"Patch is empty\" err\n '\n\nor something like that. The title says it tests the default case,\nso do not test --empty=die case in the same test. Use a separate\ntest to do the same for the case where an explicit \"--empty=die\"\nis given.\n\nAs I said, I do not quite see the point of testing with both\nempty-commit.patch and cover-letter.patch (unless the latter has an\nempty commit and a cover letter, totally in two messages).\n\n> +\ttest_must_fail git am --empty=die empty-commit.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply &&\n> +\n> +\ttest_must_fail git am --empty=die cover-letter.patch >err &&\n> +\ttest_path_is_dir .git/rebase-apply &&\n> +\ttest_i18ngrep \"Patch is empty.\" err &&\n> +\trm -fr .git/rebase-apply\n> +'\n> +\n> +test_expect_success 'skip without error when meeting e-mail message that lacks a patch' '\n> +\tgit am --empty=drop empty-commit.patch >err &&\n\nThe output 'err' is used by nobody; do not redirect it and just\nleave the standard output alone.\n\n> +\ttest_path_is_missing .git/rebase-apply &&\n\nDon't test this condition when testing success or failure from\n\"am\". That is too much implementation detail.\n\n> +\tgit rev-parse empty-commit^ >expected &&\n> +\tgit rev-parse HEAD >actual &&\n> +\ttest_cmp expected actual &&\n\nOK, we make sure that HEAD does not move.\n\n> +\tgit am --empty=drop cover-letter.patch >err &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\ttest_cmp_rev empty-commit^ HEAD\n\nLose this one? As I said, I may be missing some subtle reason why\nboth need to be tested---and if it is the case, test it in a\nseparate test, not 2 of them in a single test like this.\n\n> +'\n> +\n> +test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '\n> +\tgit am --empty=keep empty-commit.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\t{\n> +\t\tgit show empty-commit --format=\"%B\" &&\n> +\t\techo \"--\" &&\n\nDid this test pass? Without a trailing whitespace after double-dash,\nI do not think this shell snippet reproduces a patch e-mail correctly\n\nIn any case, don't do this. Imagine a future developer may want to\nimprove the patch output by adding other things after the \"-- \"\nsignature line, in addition to the \"git version\". Or perhaps the\n\"git version\" trailer gets removed by default for privacy concerns.\n\nShould such changes be prevented from being made, only because this\ntest expects exact output we have today? No.\n\nVerify what we _care_, e.g. \"does the title of the resulting commit\nreproduce the one-liner message given to '-m' when the empty commit\nwas made?\" is a sensible question to ask.\n\n> +\t\tgit version | sed -e \"s/^git version //\" &&\n> +\t\techo\n\n> +\t} >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\ttest_cmp actual expected &&\n> +\n> +\tgit am --empty=keep cover-letter.patch &&\n> +\ttest_path_is_missing .git/rebase-apply &&\n> +\t{\n> +\t\techo \"*** SUBJECT HERE ***\" &&\n> +\t\techo &&\n> +\t\techo \"*** BLURB HERE ***\" &&\n> +\t\techo &&\n> +\t\techo \"A U Thor (1):\" &&\n> +\t\tprintf \" \" &&\n> +\t\tgit show empty-commit --format=\"%B\" &&\n> +\t\techo \"--\" &&\n> +\t\tgit version | sed -e \"s/^git version //\" &&\n> +\t\techo\n\nDon't do this. Imagine a future developer may want to improve the\ncover letter template. Should that change be prevented from being\nmade, because this test expects exact output we have today? No.\n\n> +\t} >expected &&\n> +\tgit show HEAD --format=\"%B\" >actual &&\n> +\ttest_cmp actual expected\n> +'\n> +\n> test_done\n\nThanks.\n"},{"id":"441680","messageId":"xmqqr1bdrlpq.fsf@gitster.g","threadId":"56877","inReplyTo":"e907a2b2faa1e3c5854504c23cc6e118c2125817.1637232636.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v6 3/3] am: throw an error when passing --empty option without value","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-11-19T01:13:53Z","receivedAt":"2021-11-19T01:13:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Aleen via GitGitGadget\" writes:\n\n> From: Aleen \n\nHere is a place for you to explain why this change might be a good\nidea to defend it. If we applied 1/3 and 2/3 but not this one, what\nhappens? \"am --empty\" (not \"am --empty=\") is accepted and\nbehaves just like \"am --empty=die\"? Is that a bad thing?\n\nIf it is unconditonally a bad thing, then this patch does not stand\non its own. It should be squashed into the previous step; otherwise\nit would be \"oops, we didn't think it through and failed to detect\nan argument-less --error as an error in the previous step, and here\nis a fix for that mistake\". We try not to deliberately commit a\nmistake and then fix it to gain commit counts in this project (or\nputting it differently, we try to pretend we are better than we\nreally are and did not make a mistake in the first place).\n\nOr are you giving list participants and reviewers a choice between\n\"'--empty' is a synonym to '--empty=die'\" and \"'--empty' alone is an\nerror\" because you cannot decide yourself? If that is the case, you\nreally really need to make it clear in this place between \"From:\"\nand \"Signed-off-by:\". Why would we want to use this patch? Why\nwould we be better without this patch?\n\nI haven't thought things through, but my gut feeling is that the\nsemantics of the --empty= option is better _with_ this,\nin other words, it makes more sense to forbid \"--empty\" alone. So\nif I were doing this series, I would probably have squashed this\ninto the previous one, making it a two-patch series.\n\nThanks.\n\n\n> Signed-off-by: Aleen \n> ---\n> builtin/am.c | 13 +++++++------\n> t/t4150-am.sh | 8 +++++++-\n> 2 files changed, 14 insertions(+), 7 deletions(-)\n\n\n> diff --git a/builtin/am.c b/builtin/am.c\n> index 1a3ed87b445..5d487b5256b 100644\n> --- a/builtin/am.c\n> +++ b/builtin/am.c\n> @@ -185,12 +185,14 @@ static int am_option_parse_quoted_cr(const struct option *opt,\n> \treturn 0;\n> }\n> \n> -static int am_option_parse_empty_commit(const struct option *opt,\n> +static int am_option_parse_empty(const struct option *opt,\n> \t\t\t\t const char *arg, int unset)\n> {\n> \tint *opt_value = opt->value;\n> \n> -\tif (unset || !strcmp(arg, \"die\"))\n> +\tBUG_ON_OPT_NEG(unset);\n\n\n\n> +\tif (!strcmp(arg, \"die\"))\n> \t\t*opt_value = DIE_EMPTY_COMMIT;\n> \telse if (!strcmp(arg, \"drop\"))\n> \t\t*opt_value = DROP_EMPTY_COMMIT;\n> @@ -2391,10 +2393,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)\n> \t\t{ OPTION_STRING, 'S', \"gpg-sign\", &state.sign_commit, N_(\"key-id\"),\n> \t\t N_(\"GPG-sign commits\"),\n> \t\t PARSE_OPT_OPTARG, NULL, (intptr_t) \"\" },\n> -\t\t{ OPTION_CALLBACK, 0, \"empty\", &state.empty_type,\n> -\t\t \"(die|drop|keep)\",\n> -\t\t N_(\"specify how to handle empty patches\"),\n> -\t\t PARSE_OPT_OPTARG, am_option_parse_empty_commit },\n> +\t\tOPT_CALLBACK_F(0, \"empty\", &state.empty_type, \"{drop,keep,die}\",\n> +\t\t N_(\"how to handle empty patches\"),\n> +\t\t PARSE_OPT_NONEG, am_option_parse_empty),\n> \t\tOPT_HIDDEN_BOOL(0, \"rebasing\", &state.rebasing,\n> \t\t\tN_(\"(internal use for git-rebase)\")),\n> \t\tOPT_END()\n> diff --git a/t/t4150-am.sh b/t/t4150-am.sh\n> index 3119556884d..c32d21e80da 100755\n> --- a/t/t4150-am.sh\n> +++ b/t/t4150-am.sh\n> @@ -1165,8 +1165,14 @@ test_expect_success 'still output error with --empty when meeting empty files' '\n> \ttest_cmp expected actual\n> '\n> \n> -test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n> +test_expect_success 'invalid when passing no value for the --empty option' '\n> \tgit checkout empty-commit^ &&\n> +\ttest_must_fail git am --empty empty-commit.patch 2>err &&\n> +\techo \"error: Invalid value for --empty: empty-commit.patch\" >expected &&\n> +\ttest_cmp expected err\n> +'\n> +\n> +test_expect_success 'error when meeting e-mail message that lacks a patch by default' '\n> \ttest_must_fail git am empty-commit.patch >err &&\n> \ttest_path_is_dir .git/rebase-apply &&\n> \ttest_i18ngrep \"Patch is empty.\" err &&\n"},{"id":"441682","messageId":"b9c1244.36.17d35decb26.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"xmqqilwpuiv4.fsf@gitster.g","subject":"Re: [PATCH v6 0/3] am: support --empty=(die|drop|keep) option to handle empty patches","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-19T01:45:33Z","receivedAt":"2021-11-19T01:45:44Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"> -----Original Messages-----From:\"Junio C Hamano\" Sent Time:2021-11-19 07:47:11 (Friday)To:\"Aleen via GitGitGadget\" Cc:git@vger.kernel.org, \"René Scharfe\" , \"Phillip Wood\" , \"Aleen 徐沛文\" , Aleen Subject:Re: [PATCH v6 0/3] am: support --empty=(die|drop|keep) option to handle empty patches\n> \n> \n> As per https://git-scm.com/docs/SubmittingPatches#sign-off:\n> \n> Please don’t hide your real name.\n> \n> I suspect your real name is not Aleen, but something with x and w in\n> it.\n>\n\nI have used \"Aleen\" as my GitHub account to send this pull request, but the e-mail service disgusts me that it is slow to send emails to the domain \"vger.kernel.org\". So I decided to use another mail service to discuss, \"Aleen 徐沛文\" as you saw.\n\nIn the open-source world, I usually signed off \"Aleen\" rather than \"Aleen 徐沛文\", and is that necessary to change?"},{"id":"441683","messageId":"526ec6c0.87.17d35f63231.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"xmqqr1bdrlpq.fsf@gitster.g","subject":"Re: [PATCH v6 3/3] am: throw an error when passing --empty option without value","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-19T02:11:06Z","receivedAt":"2021-11-19T02:11:12Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"> Here is a place for you to explain why this change might be a good\n> idea to defend it. If we applied 1/3 and 2/3 but not this one, what\n> happens? \"am --empty\" (not \"am --empty=\") is accepted and\n> behaves just like \"am --empty=die\"? Is that a bad thing?\n> \n> If it is unconditonally a bad thing, then this patch does not stand\n> on its own. It should be squashed into the previous step; otherwise\n> it would be \"oops, we didn't think it through and failed to detect\n> an argument-less --error as an error in the previous step, and here\n> is a fix for that mistake\". We try not to deliberately commit a\n> mistake and then fix it to gain commit counts in this project (or\n> putting it differently, we try to pretend we are better than we\n> really are and did not make a mistake in the first place).\n> \n> Or are you giving list participants and reviewers a choice between\n> \"'--empty' is a synonym to '--empty=die'\" and \"'--empty' alone is an\n> error\" because you cannot decide yourself? If that is the case, you\n> really really need to make it clear in this place between \"From:\"\n> and \"Signed-off-by:\". Why would we want to use this patch? Why\n> would we be better without this patch?\n> \n> I haven't thought things through, but my gut feeling is that the\n> semantics of the --empty= option is better _with_ this,\n> in other words, it makes more sense to forbid \"--empty\" alone. So\n> if I were doing this series, I would probably have squashed this\n> into the previous one, making it a two-patch series.\n> \n> Thanks.\n\nHamano, I could not make this decision like what you said between \"'--empty' is a synonym to '--empty=die'\" and \"'--empty' alone is an error\". In my opinion, it is a little wired that '--empty' should not act as \"died\" semantically. Reversely, it may be better to support a synonym between '--quiet' and '--empty=skip'.\n\nI will squash the commit into the previous one later and hope all participants and reviewers make a decision.\n"},{"id":"441687","messageId":"75b05498.16b.17d36694413.Coremail.pwxu@coremail.cn","threadId":"56877","inReplyTo":"xmqqilwpuiv4.fsf@gitster.g","subject":"Re: [PATCH v6 0/3] am: support --empty=(die|drop|keep) option to handle empty patches","fromName":"Aleen 徐沛文","fromEmail":"pwxu@coremail.cn","sentAt":"2021-11-19T04:16:48Z","receivedAt":"2021-11-19T04:17:19Z","isPatch":true,"sender":{"key":"pwxu@coremail.cn","avatar":null},"body":"> As per https://git-scm.com/docs/SubmittingPatches#sign-off:\n> \n> Please don’t hide your real name.\n> \n> I suspect your real name is not Aleen, but something with x and w in\n> it.\n\nBTW, gitgitgadget has defined that developers should sign off the user name\nof the GitHub account, and I can't change it at all."},{"id":"441688","messageId":"pull.1076.v7.git.1637298298.gitgitgadget@gmail.com","threadId":"56877","inReplyTo":"pull.1076.v6.git.1637232636.gitgitgadget@gmail.com","subject":"[PATCH v7 0/2] am: support --empty=(die|drop|keep) option to handle empty patches","fromName":"Aleen via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-11-19T05:04:56Z","receivedAt":"2021-11-19T05:05:08Z","isPatch":true,"sender":{"key":"aleen42@vip.qq.com","avatar":"https://avatars.githubusercontent.com/u/9573300?v=4"},"body":"Since that git has supported the --always option for the git-format-patch\ncommand to create a patch with an empty commit message, git-am should\nsupport applying and committing with empty patches.\n\n----------------------------------------------------------------------------\n\nChanges since v1:\n\n 1. add a case when not passing the --always option.\n 2. rename the --always option to --allow-empty.\n\n----------------------------------------------------------------------------\n\nChanges since v2:\n\n 1. rename the --allow-empty option to --empty-commit.\n 2. introduce three different strategies (die|skip|asis) when trying to\n record empty patches as empty commits.\n\n----------------------------------------------------------------------------\n\nChanges since v3:\n\n 1. generate the missed file for test cases.\n 2. grep -f cannot be used under Mac OS.\n\n----------------------------------------------------------------------------\n\nChanges since v4:\n\n 1. rename the --empty-commit option to --empty.\n 2. rename three different strategies (die|skip|asis) to die, drop and keep\n correspondingly.\n\n----------------------------------------------------------------------------\n\nChanges since v5:\n\n 1. throw an error when passing --empty option without value.\n\n----------------------------------------------------------------------------\n\ncc: René Scharfe l.s.r@web.de cc: Phillip Wood phillip.wood123@gmail.com cc:\nAleen 徐沛文 pwxu@coremail.cn\n\nAleen (2):\n doc: git-format-patch: describe the option --always\n am: support --empty=