git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: git <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>,
	"Frédéric Brière" <fbriere@fbriere.net>,
	"Johannes Schindelin" <johannes.schindelin@gmx.de>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH] checkout: do not switch branch during a rebase unless -f is given
Date: Tue, 9 Nov 2010 08:38:16 -0600	[thread overview]
Message-ID: <20101109143816.GC18960@burratino> (raw)
In-Reply-To: <AANLkTi=VtP=T7PwY-PcZ9sHy0FjU8Nj=Fe1eWc44Q+OE@mail.gmail.com>

Nguyen Thai Ngoc Duy wrote:

> I don't know. If we can place the branch lock inside
> .git/rebase-merge, then yes removing that directory will also remove
> the lock. But how does git find the locks if they are everywhere in
> .git?

Could the lock signature say something to the effect that "this lock
is only valid against commands that don't declare this signature, and
only so long as .git/rebase-merge/ref has such-and-such content"?

  reply	other threads:[~2010-11-09 14:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-28  4:52 [PATCH] commit: do not switch branch during a rebase unless -f is given Nguyễn Thái Ngọc Duy
2010-09-28  4:55 ` [PATCH] checkout: " Nguyễn Thái Ngọc Duy
2010-09-28  5:33   ` Jonathan Nieder
2010-09-28  5:47     ` Nguyen Thai Ngoc Duy
2010-11-09 13:40       ` Nguyen Thai Ngoc Duy
2010-11-09 14:06         ` Jonathan Nieder
2010-11-09 14:11           ` Sverre Rabbelier
2010-11-09 14:36             ` Jonathan Nieder
2010-11-09 14:15           ` Nguyen Thai Ngoc Duy
2010-11-09 14:38             ` Jonathan Nieder [this message]
2010-09-28  5:38 ` [PATCH] commit: " Junio C Hamano
2010-09-28 11:24 ` Sverre Rabbelier

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=20101109143816.GC18960@burratino \
    --to=jrnieder@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=fbriere@fbriere.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=pclouds@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).