update-index: when --unresolve, smudge the relevant cache-tree entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 26, 2006 at 22:05 UTC
497c32136f80aca5f724bf70c2a0f44b63cb79f1
1 file changed
+1
update-index.c
+1
@@ -562,6 +562,7 @@ static int unresolve_one(const char *path)
562
goto free_return;
563
}
564
565
+ cache_tree_invalidate_path(active_cache_tree, path);
566
remove_file_from_cache(path);
567
if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
568
error("%s: cannot add our version to the index.", path);