not uptodate. Cannot merge

Hi,

My little bitbucket "cherry-pick" button is failing on Windows from a "git reset --hard" blowing up.

My situation: Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows 10-10.0-amd64. But I suspect even more recent Git will have the same problem.

Now, I'm pretty far from Kansas here as you'll see from my "git clone" invocation:

git.exe clone -c core.checkStat=minimal -c core.fileMode=false -c core.ignoreStat=true -c core.trustctime=false -c core.logAllRefUpdates=false --shared C:\Users\gsylvie\dev\bb\target\bitbucket\home\shared\data\repositories\1 C:\Users\gsylvie\dev\bb\target\bitbucket\home\caches\bbClones\1

Right after cloning I create a ".git/info/attributes" file containing just this one line:

* -text

After the clone, here's the sequence of commands leading up to the bad "git reset --hard". These are all fine (well, the "--aborts" whine a little, but that's expected):

git.exe branch --unset-upstream git.exe update-index --refresh git.exe rebase --abort git.exe cherry-pick --abort

And here's the "git reset --hard" that fails:

git.exe reset --hard --quiet d6edcbf924697ab811a867421dab60d954ccad99 --

--- Exit=128 error: Entry 'basic_branching/file.txt' not uptodate. Cannot merge. fatal: Could not reset index file to revision 'd6edcbf924697ab811a867421dab60d954ccad99'. ---

For now I've come up with an astonishing workaround: I just run "git status" afterwards, and then everything is fine!

I'm going to limp along with this remedy, but I thought I'd share it here in case anyone has any ideas, or in case it really is a bug.

- Sylvie

p.s.  Thanks for mentioning "git-reverse.sh" in git rev news!