diff options
| author | Genki Sky <sky@genki.is> | 2018-02-04 23:08:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-07 22:26:46 +0300 |
| commit | a6c612b528a22fe9d4cad8807e36d18f2f0fea2c (patch) | |
| tree | a520da1c06053fdf5f37f7bb6e55adea3c1e4cbd /builtin/rebase--helper.c | |
| parent | 5be1f00a9a701532232f57958efab4be8c959a29 (diff) | |
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 <sky@genki.is>
Reviewed-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase--helper.c')
| -rw-r--r-- | builtin/rebase--helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 7daee544b7..2090114e9a 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -22,6 +22,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")), + OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message, + N_("allow commits with empty messages")), OPT_CMDMODE(0, "continue", &command, N_("continue rebase"), CONTINUE), OPT_CMDMODE(0, "abort", &command, N_("abort rebase"), |