Also includes I91ef02c9 fix
Still need to fix up error handling
Need to optimise away needless IndexDiff usage
Can refactor to use jgit change Id7cbce47 to perform unstage operation
Change-Id: I4377d460e19900c0686463e9038f9724d7d7783d