From 497c32136f80aca5f724bf70c2a0f44b63cb79f1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 26 Apr 2006 22:05:05 -0700 Subject: [PATCH] update-index: when --unresolve, smudge the relevant cache-tree entries. Signed-off-by: Junio C Hamano --- update-index.c | 1 + 1 file changed, 1 insertion(+) diff --git a/update-index.c b/update-index.c index 258a88cbe..1c1f13bd7 100644 --- a/update-index.c +++ b/update-index.c @@ -562,6 +562,7 @@ static int unresolve_one(const char *path) goto free_return; } + cache_tree_invalidate_path(active_cache_tree, path); remove_file_from_cache(path); if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) { error("%s: cannot add our version to the index.", path); -- 2.26.2