From: Phillip Wood Date: Sun, 09 Feb 2020 15:59:06 GMT Subject: Re: [PATCH v4 01/19] git-rebase.txt: update description of --allow-empty-message Message-ID: <09f2a9bd-1fd2-b44b-a279-baf37ae23391@gmail.com> In-Reply-To: <3ea48d53940cb7e1a82a8a6eb819497c0448af6a.1579155273.git.gitgitgadget@gmail.com> Hi Elijah On 16/01/2020 06:14, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > Commit b00bf1c9a8dd ("git-rebase: make --allow-empty-message the > default", 2018-06-27) made --allow-empty-message the default and thus > turned --allow-empty-message into a no-op but did not update the > documentation to reflect this. Update the documentation now, and hide > the option from the normal -h output since it is not useful. > > Signed-off-by: Elijah Newren > --- > Documentation/git-rebase.txt | 7 ++++--- > builtin/rebase.c | 12 +++++++----- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 0c4f038dd6..c83be7ffc2 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -265,9 +265,10 @@ See also INCOMPATIBLE OPTIONS below. > See also INCOMPATIBLE OPTIONS below. > > --allow-empty-message:: > - By default, rebasing commits with an empty message will fail. > - This option overrides that behavior, allowing commits with empty > - messages to be rebased. > + No-op. Rebasing commits with an empty message used to fail > + and this option would override that behavior, allowing commits > + with empty messages to be rebased. Now commits with an empty > + message do not cause rebasing to halt. Do we want to mention that the user can pass --no-allow-empty-message to override this? Best Wishes Phillip > + > See also INCOMPATIBLE OPTIONS below. > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 8081741f8a..faa4e0d406 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -453,8 +453,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) > OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"), > REBASE_FORCE), > OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")), > - OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message, > - N_("allow commits with empty messages")), > + OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message, > + N_("allow commits with empty messages"), > + PARSE_OPT_HIDDEN), > OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")), > OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins, > N_("keep original branch points of cousins")), > @@ -1495,9 +1496,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > OPT_STRING_LIST('x', "exec", &exec, N_("exec"), > N_("add exec lines after each commit of the " > "editable list")), > - OPT_BOOL(0, "allow-empty-message", > - &options.allow_empty_message, > - N_("allow rebasing commits with empty messages")), > + OPT_BOOL_F(0, "allow-empty-message", > + &options.allow_empty_message, > + N_("allow rebasing commits with empty messages"), > + PARSE_OPT_HIDDEN), > {OPTION_STRING, 'r', "rebase-merges", &rebase_merges, > N_("mode"), > N_("try to rebase merges instead of skipping them"), >