threads / patch / 52069

patchrebase: hide --preserve-merges option

Subject: [PATCH] rebase: hide --preserve-merges option

## tl;dr

2 messages between Oct 18, 2019 and Oct 21, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Denton Liu· Oct 18, 2019, 23:55 UTC · lore

Since --preserve-merges has been deprecated in favour of --rebase-merges, mark this option as hidden so it no longer shows up in the usage and completions.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
This patch continues the deprecation effort and can be based on top of
`js/rebase-deprecate-preserve-merges`.

 builtin/rebase.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Show changes to builtin/rebase.c +4 −3

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 21ac10f739..0d63651d95 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			N_("let the user edit the list of commits to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive },
-		OPT_SET_INT('p', "preserve-merges", &options.type,
-			    N_("(DEPRECATED) try to recreate merges instead of "
-			       "ignoring them"), REBASE_PRESERVE_MERGES),
+		OPT_SET_INT_F('p', "preserve-merges", &options.type,
+			      N_("(DEPRECATED) try to recreate merges instead of "
+				 "ignoring them"),
+			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
 		OPT_BOOL(0, "rerere-autoupdate",
 			 &options.allow_rerere_autoupdate,
 			 N_("allow rerere to update index with resolved "

-- 
2.23.0

Junio C Hamano· Oct 21, 2019, 03:04 UTC · re: Denton Liu · lore

Re: [PATCH] rebase: hide --preserve-merges option

Denton Liu <liu.denton@gmail.com> writes:

Show 8 quoted lines

> Since --preserve-merges has been deprecated in favour of
> --rebase-merges, mark this option as hidden so it no longer shows up in
> the usage and completions.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> This patch continues the deprecation effort and can be based on top of
> `js/rebase-deprecate-preserve-merges`.

Sounds good. Let's keep it and have it part of the first batch after the release.

Show 22 quoted lines

>
>  builtin/rebase.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 21ac10f739..0d63651d95 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1099,9 +1099,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  			N_("let the user edit the list of commits to rebase"),
>  			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
>  			parse_opt_interactive },
> -		OPT_SET_INT('p', "preserve-merges", &options.type,
> -			    N_("(DEPRECATED) try to recreate merges instead of "
> -			       "ignoring them"), REBASE_PRESERVE_MERGES),
> +		OPT_SET_INT_F('p', "preserve-merges", &options.type,
> +			      N_("(DEPRECATED) try to recreate merges instead of "
> +				 "ignoring them"),
> +			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
>  		OPT_BOOL(0, "rerere-autoupdate",
>  			 &options.allow_rerere_autoupdate,
>  			 N_("allow rerere to update index with resolved "