From: Bryan Turner <bturner@atlassian.com>
To: Elijah Newren <newren@gmail.com>
Cc: usbuser@mailbox.org, Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Unexpected or wrong ff, no-ff and ff-only behaviour
Date: Tue, 9 Jul 2019 13:51:39 -0700 [thread overview]
Message-ID: <CAGyf7-FW-_4AbWE735-=7WjZAaTLHOT_QuWOoHKAjOzZCbWhFA@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BGPLxR7NgXRHppLy_W0c=Odhhns2RjcQ4iWKKQMz+SpDQ@mail.gmail.com>
On Tue, Jul 9, 2019 at 1:33 PM Elijah Newren <newren@gmail.com> wrote:
>
> On Tue, Jul 9, 2019 at 10:00 AM <usbuser@mailbox.org> wrote:
> >
> > Additionally I would also want to change the wording for --ff-only, as it currently reads as if it only performs a check (which would lead to the expected behaviour) but does more than that, as it prevents "real merges" altogether.
>
> You've lost me again, I think. You expect --ff-only to only perform a
> check, i.e. to not update anything and thus only report on whether a
> fast-forward would be possible, but leave the branch exactly where it
> started no matter what?
>
> Or is it just still not clear that a fast forward by definition is not
> "a real merge", i.e. it means to update using a mechanism that doesn't
> involve creating any new commits?
I think this is something I've seen come up on the list before[1]
(Roland can correct me if I'm wrong). What I've seen asked for before
is the ability to pass the combination "--ff-only --no-ff" and have
that:
* Ensure the branch to be merged is fast-forward from the current
branch (i.e., to ensure no merge commit is actually necessary), but
* Create a redundant merge commit anyway
This retains the ancestry (as in, it shows where the branches were
merged), but the merge is always effectively a no-op (no risk of
unintended interactions, the sort of subtle breakages where the merge
succeeds but the code on each "side" isn't entirely compatible,
resulting in broken compilation and/or tests and/or runtime).
Best regards,
Bryan Turner
[1] https://public-inbox.org/git/CAP4gbxqjHzqHhPuNK8UOwPMa46g2=vcNSk1AvGjxN8s+ou-0Dw@mail.gmail.com/
next prev parent reply other threads:[~2019-07-09 20:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 9:42 Unexpected or wrong ff, no-ff and ff-only behaviour usbuser
2019-07-09 14:51 ` Junio C Hamano
2019-07-09 16:15 ` Roland Jäger
2019-07-09 16:35 ` Elijah Newren
2019-07-09 17:00 ` usbuser
2019-07-09 20:33 ` Elijah Newren
2019-07-09 20:51 ` Bryan Turner [this message]
2019-07-10 7:49 ` usbuser
2019-07-10 16:34 ` Junio C Hamano
2019-07-11 5:13 ` Sergey Organov
2019-07-11 17:03 ` Junio C Hamano
2019-07-12 13:50 ` Sergey Organov
2019-07-12 16:24 ` Elijah Newren
2019-07-15 12:08 ` Sergey Organov
2019-07-12 18:33 ` Junio C Hamano
2019-07-15 12:47 ` Sergey Organov
2019-07-15 16:57 ` Junio C Hamano
2019-07-19 11:00 ` Sergey Organov
2019-07-11 15:46 ` brian m. carlson
2019-07-10 14:36 ` Sergey Organov
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='CAGyf7-FW-_4AbWE735-=7WjZAaTLHOT_QuWOoHKAjOzZCbWhFA@mail.gmail.com' \
--to=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=usbuser@mailbox.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).