From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 05:05:05 +0000 (-0700)
Subject: update-index: when --unresolve, smudge the relevant cache-tree entries.
X-Git-Tag: v1.4.0-rc1~45^2~14
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=497c32136f80aca5f724bf70c2a0f44b63cb79f1;p=git.git

update-index: when --unresolve, smudge the relevant cache-tree entries.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/update-index.c b/update-index.c
index 258a88cb..1c1f13bd 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);