From: Jeff King <peff@peff.net>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: James Blackburn <jamesblackburn@gmail.com>, git@vger.kernel.org
Subject: Re: Cannot rewrite branch(es) with a dirty working directory
Date: Thu, 1 Sep 2011 17:50:03 -0400 [thread overview]
Message-ID: <20110901215003.GC16308@sigill.intra.peff.net> (raw)
In-Reply-To: <vpqmxeoqj61.fsf@bauges.imag.fr>
On Thu, Sep 01, 2011 at 07:14:30PM +0200, Matthieu Moy wrote:
> James Blackburn <jamesblackburn@gmail.com> writes:
>
> > Is there a particular reason why filter-branch thinks the tree is
> > dirty,
>
> No idea. It comes after a "git reset --hard", so it's supposed to be
> clean.
I wonder if there are racily clean entries[1] in the index, and
diff-index reports them as potential changes.
At any rate, filter-branch should probably be refreshing the index
before checking for dirtiness, which would give the correct answer
either way.
-Peff
[1] See Documentation/technical/racy-git.txt for more information.
next prev parent reply other threads:[~2011-09-01 21:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 15:52 Cannot rewrite branch(es) with a dirty working directory James Blackburn
2011-09-01 17:14 ` Matthieu Moy
2011-09-01 21:50 ` Jeff King [this message]
2011-09-01 21:53 ` Jeff King
2011-09-02 5:52 ` Matthieu Moy
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=20110901215003.GC16308@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=jamesblackburn@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).