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@xxxxxxxxx
.
cc: René Scharfe l.s.r@xxxxxx cc: Phillip Wood phillip.wood123@xxxxxxxxx cc:
Aleen 徐沛文 pwxu@xxxxxxxxxxx
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: ca35af825273b98fc8dc11527488952f5db8eb80
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1076%2Faleen42%2Fnext-v10
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1076/aleen42/next-v10
Pull-Request: https://github.com/gitgitgadget/git/pull/1076
Range-diff vs v9:
1: 3b41ca3dec7 ! 1: 59bce7131da doc: git-format-patch: describe the option --always
@@
## Metadata ##
-Author: Aleen 徐沛文 <aleen42@xxxxxxxxxx>
+Author: Aleen <aleen42@xxxxxxxxxx>
## Commit message ##
doc: git-format-patch: describe the option --always
@@ Commit message
This commit has described how to use '--always' option in the command
'git-format-patch' to include patches for commits that emit no changes.
- Signed-off-by: Aleen 徐沛文 <aleen42@xxxxxxxxxx>
+ Signed-off-by: 徐沛文 (Aleen) <aleen42@xxxxxxxxxx>
## Documentation/git-format-patch.txt ##
@@ Documentation/git-format-patch.txt: SYNOPSIS
2: d2ec18b36af ! 2: 5025ad30ba7 am: support --empty=<option> to handle empty patches
@@
## Metadata ##
-Author: Aleen 徐沛文 <aleen42@xxxxxxxxxx>
+Author: Aleen <aleen42@xxxxxxxxxx>
## Commit message ##
am: support --empty=<option> to handle empty patches
@@ Commit message
those empty patches. In this commit, we have implemented three
valid options ('die', 'drop' and 'keep').
- Signed-off-by: Aleen 徐沛文 <aleen42@xxxxxxxxxx>
+ Signed-off-by: 徐沛文 (Aleen) <aleen42@xxxxxxxxxx>
## Documentation/git-am.txt ##
@@ Documentation/git-am.txt: SYNOPSIS
--
gitgitgadget
