pr-1076/aleen42/next-v11
tagged this
23 Nov 15:26
Since that git has supported the --always option for the git-format-patch command to create a patch with an empty commit message, git-am should support applying and committing with empty patches. ---------------------------------------------------------------------------- Changes since v1: 1. add a case when not passing the --always option. 2. rename the --always option to --allow-empty. ---------------------------------------------------------------------------- Changes since v2: 1. rename the --allow-empty option to --empty-commit. 2. introduce three different strategies (die|skip|asis) when trying to record empty patches as empty commits. ---------------------------------------------------------------------------- Changes since v3: 1. generate the missed file for test cases. 2. grep -f cannot be used under Mac OS. ---------------------------------------------------------------------------- Changes since v4: 1. rename the --empty-commit option to --empty. 2. rename three different strategies (die|skip|asis) to die, drop and keep correspondingly. ---------------------------------------------------------------------------- Changes since v5: 1. throw an error when passing --empty option without value. ---------------------------------------------------------------------------- Changes since v6: 1. add i18n resources. ---------------------------------------------------------------------------- Changes since v7: 1. update code according to the seen branch. 2. fix the wrong document of git-am. 3. sign off commits by a real name. ---------------------------------------------------------------------------- Changes since v8: 1. update the committer's name with my real name to fix DCO of GGG. ---------------------------------------------------------------------------- Changes since v9: 1. imitate the signed name format of https://lore.kernel.org/git/pull.1143.git.git.1637347813367.gitgitgadget@gmail.com . cc: René Scharfe l.s.r@web.de cc: Phillip Wood phillip.wood123@gmail.com cc: Aleen 徐沛文 pwxu@coremail.cn cc: Aleen 徐沛文 pwxu@coremail.cn 徐沛文 (Aleen) (2): doc: git-format-patch: describe the option --always am: support --empty=<option> to handle empty patches Documentation/git-am.txt | 8 +++++ Documentation/git-format-patch.txt | 6 +++- builtin/am.c | 55 +++++++++++++++++++++++++++--- t/t4150-am.sh | 49 ++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 6 deletions(-) base-commit: f8b28837226f3932b867ca88a4f830bf203d2afe Submitted-As: https://lore.kernel.org/git/pull.1076.v11.git.1637681215.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.git.1636693095.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v2.git.1636700040.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v3.git.1636972769.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v4.git.1637039888.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v5.git.1637141636.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v6.git.1637232636.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v7.git.1637298298.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v8.git.1637563611.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v9.git.1637564554.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1076.v10.git.1637567471.gitgitgadget@gmail.com
Assets 2
-
2021-11-23T15:26:55Z -
2021-11-23T15:26:55Z -