[PATCH 10/19] reset --keep: only write index file once

2013-01-09 Thread Martin von Zweigbergk
git reset --keep calls reset_index_file() twice, first doing a two-way merge to the target revision, updating the index and worktree, and then resetting the index. After each call, we write the index file. In the unlikely event that the second call to reset_index_file() fails, the index will have

Re: [PATCH 10/19] reset --keep: only write index file once

2013-01-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: git reset --keep calls reset_index_file() twice, first doing a two-way merge to the target revision, updating the index and worktree, and then resetting the index. After each call, we write the index file. In the unlikely event that the