Stefan Sperling:

> Sorry about that. I missed that removing modified files and locally
> added files require different operations on the file index.
> 
> Here is a fixed version, with a test to confirm that it is now
> working as intended.

Yes, that works for my case.  Thank you!

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de