Skip to content

Commit

Permalink
update-index: when --unresolve, smudge the relevant cache-tree entries.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Apr 27, 2006
1 parent e7afa11 commit 497c321
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions update-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 497c321

Please sign in to comment.