Merge branch 'nd/dwim-wildcards-as-pathspecs'

diff --git a/read-cache.c b/read-cache.c
index 723d48dddfe58f50b30105689dfeb9bcb388c8f2..89dbc0837a4155f9e70b56c7d61c8742482f3659 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -999,7 +999,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
        }
        pos = -pos-1;
 
-       untracked_cache_add_to_index(istate, ce->name);
+       if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
+               untracked_cache_add_to_index(istate, ce->name);
 
        /*
         * Inserting a merged entry ("stage 0") into the index
@@ -1562,7 +1563,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
        if (mmap_size < sizeof(struct cache_header) + 20)
                die("index file smaller than expected");
 
-       mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+       mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (mmap == MAP_FAILED)
                die_errno("unable to map index file");
        close(fd);