undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/dirwalk-n-cache-tree' into next

Browse Source 
* jc/dirwalk-n-cache-tree:

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-05-20 01:55:25 -07:00
commit 7f2d5cb531
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin-rm.c
View File

@ -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);
}
/*

2
read-tree.c
View File

@ -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)