threads / patch / 57753

patchrebase: simplify an assignment of options.type in cmd_rebase

Subject: [PATCH] rebase: simplify an assignment of options.type in cmd_rebase

## tl;dr

2 messages between Apr 18, 2022 and Apr 18, 2022. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Edmundo Carmona Antoranz· Apr 18, 2022, 16:43 UTC · lore

There is an if statement where both if and else have the same assignment of options.type to REBASE_MERGE. Simplify it by getting that assigmnent out of the if.

Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
---
 builtin/rebase.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 27fde7bf28..d2d63bdef1 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1187,11 +1187,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		} else {
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "%s/interactive", merge_dir());
-			if(file_exists(buf.buf)) {
-				options.type = REBASE_MERGE;
+			options.type = REBASE_MERGE;
+			if(file_exists(buf.buf))
 				options.flags |= REBASE_INTERACTIVE_EXPLICIT;
-			} else
-				options.type = REBASE_MERGE;
 		}
 		options.state_dir = merge_dir();
 	}

-- 
2.35.1

Junio C Hamano· Apr 18, 2022, 17:07 UTC · re: Edmundo Carmona Antoranz · lore

Re: [PATCH] rebase: simplify an assignment of options.type in cmd_rebase

Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:

Show 21 quoted lines

> There is an if statement where both if and else have the same
> assignment of options.type to REBASE_MERGE. Simplify
> it by getting that assigmnent out of the if.
>
> Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
> ---
>  builtin/rebase.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 27fde7bf28..d2d63bdef1 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1187,11 +1187,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  		} else {
>  			strbuf_reset(&buf);
>  			strbuf_addf(&buf, "%s/interactive", merge_dir());
> -			if(file_exists(buf.buf)) {
> -				options.type = REBASE_MERGE;
> +			options.type = REBASE_MERGE;
> +			if(file_exists(buf.buf))

Perhaps fix the style as we are changing the line anyway by losing {}? i.e.

			if (file_exists(buf.buf))

Show 6 quoted lines

>  				options.flags |= REBASE_INTERACTIVE_EXPLICIT;
> -			} else
> -				options.type = REBASE_MERGE;
>  		}
>  		options.state_dir = merge_dir();
>  	}

Other than that, good finding!