From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Philip Oakley <philipoakley@iee.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Robert Dailey <rcdailey.lists@gmail.com>,
Git <git@vger.kernel.org>
Subject: Re: Fixup of a fixup not working right
Date: Mon, 5 Sep 2016 09:53:30 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1609050950130.129229@virtualbox> (raw)
In-Reply-To: <8F7471262D1C45D9A7BD1C29277004AD@PhilipOakley>
Hi Philip,
On Sun, 4 Sep 2016, Philip Oakley wrote:
> From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
>
> > The point is that fixup! messages are really special, and are always
> > intended to be squashed into the referenced commit *before* the latter
> > hits `master`.
>
> I think it's here that we have the hidden use case. I agree that all fixups
> should be squashed before they hit the blessed golden repository.
>
> I suspect that some use cases have intermediate repositories that
> contain a 'master' branch (it's just a name ;-) that isn't blessed and
> golden, e.g. at the team review repo level. In such cases it is possible
> for a fixup! to be passed up as part of the review, though it's not the
> current norm/expectation.
In such a case (which can totally arise when criss-crossing Pull Requests
on GitHub, for example, where a Pull Request's purpose may be to fix up
commits in another Pull Request before the latter is merged), the most
appropriate course of action is... to not reorder the fixup!s prematurely.
> > In short, I am opposed to this change.
>
> It's not like G4W doesn't need fixup!s on the side branches e.g. 5eaffe9
> ("fixup! Handle new t1501 test case properly with MinGW", 2016-07-12)
Yeah, well, Git for Windows' `master` branch is special, in that it is
constantly rebased (as "merging rebases", to keep fast-forwardability). I
would not necessarily use Git for Windows as a role model in this respect.
Ciao,
Dscho
next prev parent reply other threads:[~2016-09-05 7:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 19:24 Fixup of a fixup not working right Robert Dailey
2016-09-02 22:24 ` Philip Oakley
2016-09-03 2:22 ` Junio C Hamano
2016-09-03 14:12 ` Robert Dailey
2016-09-03 22:33 ` Philip Oakley
2016-09-04 7:36 ` Johannes Schindelin
2016-09-04 11:47 ` Philip Oakley
2016-09-05 7:53 ` Johannes Schindelin [this message]
2016-09-06 19:02 ` Philip Oakley
2016-09-07 11:31 ` Johannes Schindelin
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=alpine.DEB.2.20.1609050950130.129229@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.org \
--cc=rcdailey.lists@gmail.com \
/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).