J Wyman reported almost a year ago (and I fixed this issue in Git for Windows around that time) that the .git/ADD_EDIT.patch file might still lie around at the beginning of git add --edit from previous runs, and if the new patch is smaller than the old one, the resulting diff is obviously corrupt. This is yet another Git for Windows patch finally making it to the Git mailing list. Johannes Schindelin (1): add --edit: truncate the patch file builtin/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ecbdaf0899161c067986e9d9d564586d4b045d62 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-107%2Fdscho%2Fadd-e-truncate-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-107/dscho/add-e-truncate-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/107 -- gitgitgadget