Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/read-cache.c b/read-cache.c
index a66c87bc7a8346d1df529cae5154c8f35ba9d1ca..0e0c93edc9be5a7af5de1097eafe9d860e7d183e 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -744,7 +744,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
        if (ignore_case) {
                adjust_dirname_case(istate, ce->name);
        }
-       if (!(flags & HASH_RENORMALIZE)) {
+       if (!(flags & ADD_CACHE_RENORMALIZE)) {
                alias = index_file_exists(istate, ce->name,
                                          ce_namelen(ce), ignore_case);
                if (alias &&