[PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths.