git stash and edited hunks

Question

I totally love git add -p and git stash but I occasionally have the following problem, which is reproduced by the following sequence of commands:

Answer 1

I asked the question in the git mailing list. What I describe is the expected behaviour. It's not a bug. :-(

Here is the answer I got:

If you did not edit the hunk manually, each hunk will be either in state HEAD or in state A, and applying the diff between HEAD and A to such file will be either a no-op (hunk already applied), or a successfull application.

For me this is a severe limitation of git add --patch, and I don't understand in what way this behaviour may be useful to anyone, but I will learn to live with it.