From: Junio C Hamano <gitster@pobox.com>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase: simplify an assignment of options.type in cmd_rebase
Date: Mon, 18 Apr 2022 10:07:03 -0700 [thread overview]
Message-ID: <xmqqr15uxqvc.fsf@gitster.g> (raw)
In-Reply-To: <20220418164359.205723-1-eantoranz@gmail.com> (Edmundo Carmona Antoranz's message of "Mon, 18 Apr 2022 18:43:59 +0200")
Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:
> 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))
> options.flags |= REBASE_INTERACTIVE_EXPLICIT;
> - } else
> - options.type = REBASE_MERGE;
> }
> options.state_dir = merge_dir();
> }
Other than that, good finding!
prev parent reply other threads:[~2022-04-18 17:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 16:43 [PATCH] rebase: simplify an assignment of options.type in cmd_rebase Edmundo Carmona Antoranz
2022-04-18 17:07 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr15uxqvc.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).