Re: BUG: checkout won't checkout?

From: Luke Diamand <luke@diamand.org>
Date: Jun 18, 2015, 22:13 UTC
Message-ID: <CAE5ih7_ferSqBGnk=08DegqqpgpO7Mq8XWu4k-KAP4ENdxE_rg@mail.gmail.com>
In-Reply-To: <CAE5ih7-=WPme_BxgAjtm9hrShxTk1z+uDM-LXzc3BcN3n2vqAg@mail.gmail.com>

The other thing about these files is that they were all deleted a few weeks ago and have now come back.

On 18 June 2015 at 23:07, Luke Diamand <luke@diamand.org> wrote:

Show 21 quoted lines

> This is probably user error, but I'm not sure what I'm doing wrong.
> I'm posting here in case anyone else gets the same thing
>
> I'm using 2.4.4.598.gd7bed1d, i.e. 'next' as of today.
>
> I've somehow ended up with history skipping back in time, but git not
> prepared to let let me fix it, or something.
>
> $ git diff upstream/master -- subtree
>  - lots of deltas, which look like I've reverted this back several
> revisions (which I haven't AFAIK)
> $ git checkout upstream/master -- subtree
> $ git diff upstream/master -- subtree
> -- still lots of deltas
> $ git checkout upstream/master -- subtree
> $ git commit -m 'Revert unwanted changes'
> $ git diff upstream/master -- subtree
> -- still lots of deltas
>
> What am I doing wrong? Have I ended up in the middle of some weird
> state (cherry-pick and rebase isn't in progress AFAIK).