Re: [PATCH v7 2/2] am: support --empty=<option> to handle empty patches
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 19, 2021, 22:50 UTC
- Message-ID
- <xmqqtug7oj4g.fsf@gitster.g>
- In-Reply-To
- <9e60e77c041bca28a50d706c865eb776e5fe2ec2.1637298299.git.gitgitgadget@gmail.com>
"Aleen via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 13 quoted lines
> From: Aleen <aleen42@vip.qq.com>
>
> Since that the command 'git-format-patch' can include patches of
> commits that emit no changes, the 'git-am' command should also
> support an option, named as '--empty', to specify how to handle
> those empty patches. In this commit, we have implemented three
> valid options ('die', 'drop' and 'keep').
>
> Signed-off-by: Aleen <aleen42@vip.qq.com>
> ---
> Documentation/git-am.txt | 8 ++++++
> builtin/am.c | 55 ++++++++++++++++++++++++++++++++++++----
> t/t4150-am.sh | 49 +++++++++++++++++++++++++++++++++++Show 18 quoted lines
> po/bg.po | 2 +- > po/ca.po | 2 +- > po/de.po | 2 +- > po/el.po | 2 +- > po/es.po | 2 +- > po/fr.po | 2 +- > po/git.pot | 2 +- > po/id.po | 2 +- > po/it.po | 2 +- > po/ko.po | 2 +- > po/pl.po | 2 +- > po/pt_PT.po | 8 +++--- > po/ru.po | 4 +-- > po/sv.po | 2 +- > po/tr.po | 2 +- > po/vi.po | 2 +- > po/zh_CN.po | 9 +++++-- > po/zh_TW.po | 7 ++++-
Please do not touch these po/ files. They will be updated when i18n coordinator decides to update the translation.