From: Theodore Ts'o <tytso@mit.edu>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: James Morris <jmorris@namei.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: linux-next: unneeded merge in the security tree
Date: Tue, 12 Mar 2013 17:20:27 -0400 [thread overview]
Message-ID: <20130312212027.GE14792@thunk.org> (raw)
In-Reply-To: <CA+55aFzFLDcN-1GKae6Xqrns59K1xOD_HPzuv2Lv1__fZpqFMw@mail.gmail.com>
What if we added the ability to do something like this:
[remote "origin"]
url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
fetch = +refs/heads/master:refs/heads/master
mergeoptions = --ff-only
This would be an analog to branch.<name>.mergeoptions, but it would
apply to the source of the pull request, instead of the destination.
That way, people who do a "git pull" from Linus's tree would get the
protection of --ff-only, while pulls from submaintainer trees would
automatically get a merge commit, which is what we want.
It doesn't handle the case of a submaintainer pulling from a
maintainer in a back-merge scenario, but that should be a pretty rare
case, so maybe that's OK.
- Ted
next prev parent reply other threads:[~2013-03-12 21:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 23:09 linux-next: unneeded merge in the security tree Stephen Rothwell
2013-03-12 4:10 ` James Morris
2013-03-12 4:16 ` Theodore Ts'o
2013-03-12 5:18 ` Stephen Rothwell
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 [this message]
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=20130312212027.GE14792@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.