From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Stefan Beller <sbeller@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: git status during interactive rebase
Date: Thu, 21 Jan 2016 10:28:29 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1601211016140.2964@virtualbox> (raw)
In-Reply-To: <CAGZ79kbUwJ+CN=YoQUP=rm=EhU=fU2ynt_7Q-cd7Dic-bsx+TA@mail.gmail.com>
Hi Stefan,
On Wed, 20 Jan 2016, Stefan Beller wrote:
> So I ran an interactive rebase, and while editing
> .git/rebase-merge/git-rebase-todo I tried to run
> `git status` in another terminal to inquire about a
> filename of an untracked file.
Heh, I don't think that anybody did that before, because the rebase has
not even quite started yet...
The cop-out would be to write an empty 'done' file before editing the
todo, but it would give the wrong impression that it is safe to run `git
rebase --continue` now... Interactive rebase is *definitely* not
thread-safe ;-)
So the proper fix might be to test for the presence of the "done" file and
otherwise tell the user that this rebase has not even started yet.
Ciao,
Dscho
prev parent reply other threads:[~2016-01-21 9:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 23:21 git status during interactive rebase Stefan Beller
2016-01-21 8:23 ` Matthieu Moy
2016-01-21 22:16 ` Stefan Beller
2016-01-21 22:35 ` Junio C Hamano
2016-01-22 16:28 ` Johannes Schindelin
2016-01-21 9:28 ` Johannes Schindelin [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=alpine.DEB.2.20.1601211016140.2964@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=sbeller@google.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).