From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v7 0/5] making pull advice not to trigger when unneeded
Date: Mon, 14 Dec 2020 12:26:42 -0800 [thread overview]
Message-ID: <20201214202647.3340193-1-gitster@pobox.com> (raw)
Just to show what was pushed out on 'seen' while I was cutting the
preview release...
This is based on Felipe's v6 (which was mislabled as v5 but sent on
a different day from the true v5), with two clean-up commits
inserted between Felipe's second step (now 2/5) and the third step
(now 5/5, with necessary adjustments).
Even with the "correct condition" clean-up, I am not quite happy
with the clarity of the logic around there.
I think !opt_ff does not exactly belong to the condition, if we
consider that the eventual endgame should be to stop non-ff
operation without merge or rebase by default with an error, and that
should happen in this block. The error message there should say
"unable to fast-forward; must merge or rebase", which should equally
apply to those who gave "--ff-only" explicitly, even though they may
not need the advice message.
So with the help of can_ff bit introduced by 5/5, I _think_ this
part should become like
- if (rebase_unspecified && !opt_ff && !can_ff) {
+ if (rebase_unspecified && !can_ff &&
+ (!opt_ff || !strcmp("--ff-only", opt_ff))) {
before/when we make this codepath error out. We won't hit the body
of this if statement when we can fast-forward.
To avoid the ugly-looking "strcmp()" in the above, we may need to
adjust "--ff" (fast-forward without creating an extra merge commit)
and "--no-ff" (create an extra merge commit when the history could
be fast-forwarded) to imply "merge", though. It would automatically
make rebase_unspecified would become false. With such a tweak, we
can then simplify it further to
- if (rebase_unspecified && !can_ff &&
- (!opt_ff || !strcmp("--ff-only", opt_ff))) {
+ if (rebase_unspecified && !can_ff) {
But these are not part of this round.
Felipe Contreras (3):
pull: refactor fast-forward check
pull: give the advice for choosing rebase/merge much later
pull: display default warning only when non-ff
Junio C Hamano (2):
pull: get rid of unnecessary global variable
pull: correct condition to trigger non-ff advice
builtin/pull.c | 70 ++++++++++++++++++++++--------------
t/t7601-merge-pull-config.sh | 66 +++++++++++++++++++++++++++++++---
2 files changed, 104 insertions(+), 32 deletions(-)
--
2.30.0-rc0-186-g20447144ec
next reply other threads:[~2020-12-14 20:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 20:26 Junio C Hamano [this message]
2020-12-14 20:26 ` [PATCH v7 1/5] pull: refactor fast-forward check Junio C Hamano
2020-12-14 20:26 ` [PATCH v7 2/5] pull: give the advice for choosing rebase/merge much later Junio C Hamano
2020-12-14 20:26 ` [PATCH v7 3/5] pull: get rid of unnecessary global variable Junio C Hamano
2020-12-14 20:59 ` Felipe Contreras
2020-12-14 23:16 ` Junio C Hamano
2020-12-15 2:55 ` Felipe Contreras
2020-12-14 20:26 ` [PATCH v7 4/5] pull: correct condition to trigger non-ff advice Junio C Hamano
2020-12-14 21:17 ` Felipe Contreras
2020-12-14 23:19 ` Junio C Hamano
2020-12-15 6:35 ` Felipe Contreras
2020-12-14 20:26 ` [PATCH v7 5/5] pull: display default warning only when non-ff Junio C Hamano
2020-12-14 21:24 ` Felipe Contreras
2020-12-14 23:20 ` Junio C Hamano
2020-12-15 2:57 ` Felipe Contreras
2020-12-15 6:30 ` [PATCH v7 0/5] making pull advice not to trigger when unneeded Felipe Contreras
2020-12-15 10:58 ` Junio C Hamano
2020-12-15 12:22 ` Felipe Contreras
2020-12-18 20:46 ` Felipe Contreras
2020-12-23 10:04 ` Junio C Hamano
2020-12-23 14:10 ` Felipe Contreras
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=20201214202647.3340193-1-gitster@pobox.com \
--to=gitster@pobox.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.
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).