From: Theodore Tso <tytso@mit.edu>
To: Andi Kleen <andi@firstfloor.org>
Cc: Jakub Narebski <jnareb@gmail.com>,
Avery Pennarun <apenwarr@gmail.com>,
git@vger.kernel.org
Subject: A proposed solution (Was: nicer frontend to get rebased tree?)
Date: Sat, 23 Aug 2008 19:01:37 -0400 [thread overview]
Message-ID: <20080823230137.GD18169@mit.edu> (raw)
In-Reply-To: <20080823165350.GY23334@one.firstfloor.org>
Maybe what we need is a way in git to advertise that a particular
branch, when pulled into another repository, shouldn't be used as a
base for someone else to do development. The only question is what
can we do other than give a warning if someone tries to create a local
branch which tracks such a branch. One thought is to have a git
config option which will forbid creating local branches that track an
"rebase-unstable" branch, on the theory that the best thing to do with
such workloads is to either use them as sources for "git merge" or a
git checkout creating a detached HEAD.
Once you've merged a rebase-unstable remote branch into a local
branch, the resulting local branch could be treated "contaminated"
such that if the user tries to do any commits on such a local branch,
git issues a warning that you are committing changes onto a branch
which should be considered throwaway.
I guess the real question is whether we should be encoding quite this
much policy into git. I think it would help make it easier to
advertise what is considered the preferred workflow, and if it can all
be turned off with a git-config option, people who don't want it can
always turn it off.
What do folks think?
- Ted
next prev parent reply other threads:[~2008-08-23 23:02 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-22 17:46 nicer frontend to get rebased tree? Andi Kleen
2008-08-22 17:55 ` Linus Torvalds
2008-08-22 18:27 ` Andi Kleen
2008-08-22 19:36 ` Linus Torvalds
2008-08-22 20:11 ` Paolo Ciarrocchi
2008-08-22 20:33 ` Linus Torvalds
2008-08-22 20:36 ` Björn Steinbrink
2008-08-22 20:46 ` Paolo Ciarrocchi
2008-08-22 20:29 ` Linus Torvalds
2008-08-22 21:23 ` Junio C Hamano
2008-08-23 7:10 ` Andi Kleen
2008-08-23 9:24 ` Paolo Bonzini
2008-08-23 16:36 ` Andi Kleen
2008-08-23 23:00 ` Paolo Bonzini
2008-08-23 15:55 ` Linus Torvalds
2008-08-23 16:45 ` Andi Kleen
2008-08-23 17:58 ` Linus Torvalds
2008-08-25 9:36 ` Ingo Molnar
2008-08-23 18:18 ` Björn Steinbrink
2008-08-23 18:56 ` Linus Torvalds
2008-08-23 20:08 ` Björn Steinbrink
2008-08-23 21:38 ` Documentating branches (was: nicer frontend to get rebased tree?) Marius Vollmer
2008-08-23 22:17 ` Miklos Vajna
2008-08-23 22:30 ` Documenting branches Marius Vollmer
2008-08-23 22:18 ` Documentating branches Marius Vollmer
2008-08-22 17:56 ` nicer frontend to get rebased tree? Avery Pennarun
2008-08-22 18:31 ` Andi Kleen
2008-08-22 19:03 ` Paolo Ciarrocchi
2008-08-22 19:34 ` Jakub Narebski
2008-08-23 7:15 ` Andi Kleen
2008-08-23 8:52 ` Paolo Ciarrocchi
2008-08-23 9:21 ` Jakub Narebski
2008-08-23 16:53 ` Andi Kleen
2008-08-23 21:04 ` Paolo Ciarrocchi
2008-08-23 21:52 ` Linus Torvalds
2008-08-23 22:09 ` Paolo Ciarrocchi
2008-08-23 22:13 ` Björn Steinbrink
2008-08-24 0:30 ` Junio C Hamano
2008-08-23 22:49 ` Jakub Narebski
2008-08-23 23:01 ` Theodore Tso
2008-08-23 23:01 ` Theodore Tso [this message]
2008-08-22 20:11 ` Mikael Magnusson
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=20080823230137.GD18169@mit.edu \
--to=tytso@mit.edu \
--cc=andi@firstfloor.org \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@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).