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:06:15 -0600 [thread overview]
Message-ID: <20101109140615.GA18960@burratino> (raw)
In-Reply-To: <AANLkTinKNF6OEX=k1aepD-Zrm2_4GzHaB+SVHdfTMG-j@mail.gmail.com>
Nguyen Thai Ngoc Duy wrote:
> Another approach is to let checkout work as usual, but refuse update refs:
>
> - after rebase starts, HEAD can only be updated either by rebase, or
> any commands that keep HEAD a headless ref.
> - the branch being rebased is locked. No commands but rebase can update it.
>
> I think the second point is good for all interactive commands like
> rebase. Create a .lock file with a signature inside (e.g. command
> name). If update_ref() callers do not give correct signature, refuse
> to update.
I like it. Would it be possible to make sure the (widespread?) practice
of using
rm -fr .git/rebase-merge
to terminate a rebase without going back to the original branch
still works? I think it should be.
next prev parent reply other threads:[~2010-11-09 14:06 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 [this message]
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
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=20101109140615.GA18960@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).