* [PATCH v2] rebase: simplify an assignment of options.type in cmd_rebase
@ 2022-04-18 17:27 Edmundo Carmona Antoranz
0 siblings, 0 replies; only message in thread
From: Edmundo Carmona Antoranz @ 2022-04-18 17:27 UTC (permalink / raw)
To: git; +Cc: Edmundo Carmona Antoranz
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>
---
Range-diff:
1: 7b6483fcce ! 1: 959aff8b8e rebase: simplify an assignment of options.type in cmd_rebase
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
- if(file_exists(buf.buf)) {
- options.type = REBASE_MERGE;
+ options.type = REBASE_MERGE;
-+ if(file_exists(buf.buf))
++ if (file_exists(buf.buf))
options.flags |= REBASE_INTERACTIVE_EXPLICIT;
- } else
- options.type = REBASE_MERGE;
builtin/rebase.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 27fde7bf28..baf7a0bb36 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-18 17:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-18 17:27 [PATCH v2] rebase: simplify an assignment of options.type in cmd_rebase Edmundo Carmona Antoranz
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).