Merge branch 'js/repoconfig' into next

diff --git a/read-tree.c b/read-tree.c
index 66c0120f1352f8edf6ea1afcd037c96b373273a8..067fb95e9d552789e68e087abd9b5cf855690ceb 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);
                }
        }
+       else
+               invalidate_ce_path(merge);
        merge->ce_flags &= ~htons(CE_STAGEMASK);
        add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
        return 1;