diff options
| -rw-r--r-- | builtin-rm.c | 1 | ||||
| -rw-r--r-- | read-tree.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index 9014c61556..0beb86dc3d 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -117,6 +117,7 @@ int cmd_rm(int argc, const char **argv, char **envp) if (remove_file_from_cache(path)) die("git rm: unable to remove %s", path); + cache_tree_invalidate_path(active_cache_tree, path); } /* diff --git a/read-tree.c b/read-tree.c index a3ada55c15..55f7f87133 100644 --- a/read-tree.c +++ b/read-tree.c @@ -801,7 +801,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) { struct tree_entry_list *ent; int cnt; - + memcpy(it->sha1, tree->object.sha1, 20); for (cnt = 0, ent = tree->entries; ent; ent = ent->next) { if (!ent->directory) |