From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Theodore Ts'o" <tytso@mit.edu>
Cc: James Morris <jmorris@namei.org>,
Linus <torvalds@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: unneeded merge in the security tree
Date: Tue, 12 Mar 2013 16:18:23 +1100 [thread overview]
Message-ID: <20130312161823.86ea101fc4e45285b205817f@canb.auug.org.au> (raw)
In-Reply-To: <20130312041641.GE18595@thunk.org>
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]
On Tue, 12 Mar 2013 00:16:41 -0400 Theodore Ts'o <tytso@mit.edu> wrote:
>
> On Tue, Mar 12, 2013 at 03:10:53PM +1100, James Morris wrote:
> > On Tue, 12 Mar 2013, Stephen Rothwell wrote:
> > > The top commit in the security tree today is a merge of v3.9-rc2. This
> > > is a completely unnecessary merge as the tree before the merge was a
> > > subset of v3.9-rc1 and so if the merge had been done using anything but
> > > the tag, it would have just been a fast forward. I know that this is now
> > > deliberate behaviour on git's behalf, but isn't there some way we can
> > > make this easier on maintainers who are just really just trying to pick a
> > > new starting point for their trees after a release? (at least I assume
> > > that is what James was trying to do)
> >
> > Yes, and I was merging to a tag as required by Linus.
>
> Why not just force the head of the security tree to be v3.9-rc2? Then
> you don't end up creating a completely unnecessary merge commit, and
> users who were at the previous head of the security tree will
> experience a fast forward when they pull your new head.
Well, you used to be able to merge a tag and it would just fast forward
if possible. That was changed (for good reason), but now gives us this
outcome. Also, "git merge --ff" does not override that behaviour, but
"git merge --ff-only" does. Also, of course, if (say) origin/master had
been v3.9-rc2, then "git merge origin/master" would have also just done a
fast forward.
I wonder if "git merge v3.9-rc2^{}" should work (git says "fatal: v3.9-rc2{}
- not something we can merge").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-03-12 5:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 23:09 Stephen Rothwell
2013-03-12 4:10 ` James Morris
2013-03-12 4:16 ` Theodore Ts'o
2013-03-12 5:18 ` Stephen Rothwell [this message]
2013-03-12 13:25 ` Theodore Ts'o
2013-03-12 20:43 ` Junio C Hamano
2013-03-12 9:29 ` Sedat Dilek
2013-03-12 17:13 ` Linus Torvalds
2013-03-12 17:51 ` Geert Uytterhoeven
2013-03-12 19:49 ` Junio C Hamano
2013-03-12 20:02 ` Junio C Hamano
2013-03-12 21:20 ` Theodore Ts'o
2013-03-12 21:28 ` Linus Torvalds
2013-03-12 21:47 ` Junio C Hamano
2013-03-12 21:54 ` Linus Torvalds
2013-03-12 22:00 ` Junio C Hamano
2013-03-13 2:30 ` Theodore Ts'o
2013-03-13 3:17 ` Junio C Hamano
2013-03-12 21:30 ` Junio C Hamano
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=20130312161823.86ea101fc4e45285b205817f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
/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
all inboxes | Powered by JetHome®