From: Catalin Marinas <catalin.marinas@arm.com>
To: Pavel Roskin <proski@gnu.org>
Cc: git <git@vger.kernel.org>
Subject: Re: Locking a branch
Date: Mon, 08 May 2006 11:45:33 +0100 [thread overview]
Message-ID: <tnxzmhspzg2.fsf@arm.com> (raw)
In-Reply-To: <1146970243.24434.77.camel@dv> (Pavel Roskin's message of "Sat, 06 May 2006 22:50:43 -0400")
Pavel Roskin <proski@gnu.org> wrote:
> I see there is an active discussion about branch attributes. It
> would be nice to have an attribute to prevent git from changing the
> branch head in any way. The reason is that it interferes with StGIT
> on StGIT managed branches. If StGIT is fine with the change, it
> would remove or override the lock temporarily. StGIT could also
> unlock the branch permanently if there are no applied patches.
I'm fine with this. At the moment, StGIT does extra checking before
some of the commands to ensure that HEAD is the same as the top of the
stack (i.e. no commits were generated outside stg commands). While
I'll probably still keep this check, the addition would be useful for
people mixing GIT and StGIT commands (I personally try to stay with
StGIT commands as much as possible).
--
Catalin
prev parent reply other threads:[~2006-05-08 10:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-07 2:50 Locking a branch Pavel Roskin
2006-05-08 10:45 ` Catalin Marinas [this message]
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=tnxzmhspzg2.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=git@vger.kernel.org \
--cc=proski@gnu.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 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).