summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-27 05:05:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-27 05:05:05 (GMT)
commit497c32136f80aca5f724bf70c2a0f44b63cb79f1 (patch)
treea76bc259f298ea56fa63763921aca8f3d9d0015c
parente7afa1115beb071512ac2b8d6b7487eadbfccc74 (diff)
downloadgit-497c32136f80aca5f724bf70c2a0f44b63cb79f1.zip
git-497c32136f80aca5f724bf70c2a0f44b63cb79f1.tar.gz
git-497c32136f80aca5f724bf70c2a0f44b63cb79f1.tar.bz2
update-index: when --unresolve, smudge the relevant cache-tree entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--update-index.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/update-index.c b/update-index.c
index 258a88c..1c1f13b 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);