projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mw/alternates' into next
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
66c0120
..
49436bf
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-446,6
+446,8
@@
static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
invalidate_ce_path(old);
}
}
invalidate_ce_path(old);
}
}
+ else
+ invalidate_ce_path(merge);
merge->ce_flags &= ~htons(CE_STAGEMASK);
add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
return 1;
merge->ce_flags &= ~htons(CE_STAGEMASK);
add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
return 1;
@@
-879,8
+881,8
@@
int main(int argc, char **argv)
* valid cache-tree because the index must match exactly
* what came from the tree.
*/
* valid cache-tree because the index must match exactly
* what came from the tree.
*/
- if (trees->item && (!merge || (stage == 2))) {
- cache_tree_free(&active_cache_tree);
+ if (trees
&& trees
->item && (!merge || (stage == 2))) {
+ cache_tree_free(&active_cache_tree);
prime_cache_tree();
}
prime_cache_tree();
}