git reset -- path weirdness

Hi,

I noticed some weirdness with git reset when a path is given. Basically it seems to cycle the file through 3 states: unstaged, unmerged, deleted(!) which is IMHO weird at best. A bisection showed that the behaviour was introduced with the shell -> conversion of git-reset.

Extra annoyance is caused by the fact that "git status" tells you to add the file when it is in the unmerged state, but that doesn't do anything.

Log of "git reset" switching through the states:

doener@atjola:git (master) $ git status # On branch master nothing to commit (working directory clean)

doener@atjola:git (master) $ git reset -- builtin-reset.c builtin-reset.c: needs merge

doener@atjola:git (master) $ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # # unmerged: builtin-reset.c # no changes added to commit (use "git add" and/or "git commit -a")

doener@atjola:git (master) $ git reset -- builtin-reset.c

doener@atjola:git (master) $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # deleted: builtin-reset.c # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # builtin-reset.c

doener@atjola:git (master) $ git reset -- builtin-reset.c

doener@atjola:git (master) $ git status # On branch master nothing to commit (working directory clean)

Thanks, Björn