From a6c612b528a22fe9d4cad8807e36d18f2f0fea2c Mon Sep 17 00:00:00 2001 From: Genki Sky Date: Sun, 4 Feb 2018 15:08:13 -0500 Subject: rebase: add --allow-empty-message option This option allows commits with empty commit messages to be rebased, matching the same option in git-commit and git-cherry-pick. While empty log messages are frowned upon, sometimes one finds them in older repositories (e.g. translated from another VCS [0]), or have other reasons for desiring them. The option is available in git-commit and git-cherry-pick, so it is natural to make other git tools play nicely with them. Adding this as an option allows the default to be "give the user a chance to fix", while not interrupting the user's workflow otherwise [1]. [0]: https://stackoverflow.com/q/8542304 [1]: https://public-inbox.org/git/7vd33afqjh.fsf@alter.siamese.dyndns.org/ To implement this, add a new --allow-empty-message flag. Then propagate it to all calls of 'git commit', 'git cherry-pick', and 'git rebase--helper' within the rebase scripts. Signed-off-by: Genki Sky Reviewed-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-rebase--am.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-rebase--am.sh') diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 14c50782e0..0f78051792 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -46,6 +46,7 @@ then # makes this easy git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \ $allow_rerere_autoupdate --right-only "$revisions" \ + $allow_empty_message \ ${restrict_revision+^$restrict_revision} ret=$? else -- cgit v1.2.1