From: Felipe Contreras <felipe.contreras@gmail.com>
To: Carlo Arenas <carenas@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Philip Oakley <philipoakley@iee.email>,
Alex Henrie <alexhenrie24@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/3] pull: cleanup autostash check
Date: Tue, 15 Jun 2021 06:09:04 -0500 [thread overview]
Message-ID: <60c88a502d323_e633208fc@natae.notmuch> (raw)
In-Reply-To: <CAPUEspg_MmerWb7h8MyhgcJXbWrJeeSyeJ7z2S6eHgDfRDPKvA@mail.gmail.com>
Carlo Arenas wrote:
> On Sat, Jun 12, 2021 at 10:11 PM Felipe Contreras <
> felipe.contreras@gmail.com> wrote:
>
> > - autostash = config_autostash;
> > if (opt_rebase) {
> > + int autostash = config_autostash;
> > if (opt_autostash != -1)
> > autostash = opt_autostash;
> >
>
> since you are reducing the scope of the autostash variable anyway, why
> not refactor it additionally for clarity with (something like):
>
> int autostash = (opt_autostash != -1) ? opt_autostash : config_autostash;
Because I had like 15 branches on top of this, and wanted 1) to minimize
modifications, and 2) to minimize the chance of the patch being
rejected, and this is how the code was before f15e7cf5cc (pull: ff
--rebase --autostash works in dirty repo, 2017-06-01), so in theory
nobody could object.
But yeah, that version makes sense, and in fact I probably had such
cleanup in some branch.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-15 11:09 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 4:59 [PATCH 0/3] pull: obvious fixes Felipe Contreras
2021-06-13 4:59 ` [PATCH 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-14 14:56 ` Elijah Newren
2021-06-15 10:59 ` Felipe Contreras
[not found] ` <CAPUEspg_MmerWb7h8MyhgcJXbWrJeeSyeJ7z2S6eHgDfRDPKvA@mail.gmail.com>
2021-06-15 11:09 ` Felipe Contreras [this message]
2021-06-13 4:59 ` [PATCH 2/3] pull: trivial cleanup Felipe Contreras
2021-06-14 14:57 ` Elijah Newren
2021-06-13 4:59 ` [PATCH 3/3] pull: trivial whitespace style fix Felipe Contreras
2021-06-14 15:03 ` Elijah Newren
2021-06-14 14:47 ` [PATCH 0/3] pull: obvious fixes Elijah Newren
2021-06-15 1:25 ` Junio C Hamano
2021-06-15 10:41 ` Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 " Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 2/3] pull: trivial cleanup Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 3/3] pull: trivial whitespace style fix Felipe Contreras
2021-06-17 16:48 ` [PATCH v2 0/3] pull: obvious fixes Elijah Newren
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60c88a502d323_e633208fc@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/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.
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 NNTP newsgroup(s).