Re: [PATCH v2 10/19] pull: support pull.ff config
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 9, 2015, 23:59 UTC
- Message-ID
- <xmqqa8w8whzz.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1433314143-4478-11-git-send-email-pyokagan@gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
> > * Yup, I did mean strcmp(value, "only")
I may be missing some backstory behind this comment; in the patch, I instead see !strcmp(value, "only") and I think it makes sense.
Show 6 quoted lines
> + if (git_config_get_value("pull.ff", &value))
> + return;
> + switch (git_config_maybe_bool("pull.ff", value)) {
> + case 0:
> + strbuf_addstr(sb, "--no-ff");
> + return;Align switch and case at the same indent level; the body of switch is overindented.
Show 8 quoted lines
> + case 1:
> + strbuf_addstr(sb, "--ff");
> + return;
> + }
> + if (!strcmp(value, "only")) {
> + strbuf_addstr(sb, "--ff-only");
> + return;
> + }