Merge branch 'master' into next

diff --git a/read-cache.c b/read-cache.c
index c5474d49758b640f8942b1e3eb1a1c8f47c78ed8..50e094e0536740050dd2ac5a041c4c030ce3cfc3 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -27,6 +27,9 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
        ce->ce_uid = htonl(st->st_uid);
        ce->ce_gid = htonl(st->st_gid);
        ce->ce_size = htonl(st->st_size);
+
+       if (assume_unchanged)
+               ce->ce_flags |= htons(CE_VALID);
 }
 
 static int ce_compare_data(struct cache_entry *ce, struct stat *st)
@@ -146,9 +149,18 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
-int ce_match_stat(struct cache_entry *ce, struct stat *st)
+int ce_match_stat(struct cache_entry *ce, struct stat *st, int ignore_valid)
 {
-       unsigned int changed = ce_match_stat_basic(ce, st);
+       unsigned int changed;
+
+       /*
+        * If it's marked as always valid in the index, it's
+        * valid whatever the checked-out copy says.
+        */
+       if (!ignore_valid && (ce->ce_flags & htons(CE_VALID)))
+               return 0;
+
+       changed = ce_match_stat_basic(ce, st);
 
        /*
         * Within 1 second of this sequence:
@@ -164,7 +176,7 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
         * effectively mean we can make at most one commit per second,
         * which is not acceptable.  Instead, we check cache entries
         * whose mtime are the same as the index file timestamp more
-        * careful than others.
+        * carefully than others.
         */
        if (!changed &&
            index_file_timestamp &&
@@ -174,10 +186,10 @@ int ce_match_stat(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
-int ce_modified(struct cache_entry *ce, struct stat *st)
+int ce_modified(struct cache_entry *ce, struct stat *st, int really)
 {
        int changed, changed_fs;
-       changed = ce_match_stat(ce, st);
+       changed = ce_match_stat(ce, st, really);
        if (!changed)
                return 0;
        /*
@@ -233,6 +245,11 @@ int cache_name_compare(const char *name1, int flags1, const char *name2, int fla
                return -1;
        if (len1 > len2)
                return 1;
+
+       /* Compare stages  */
+       flags1 &= CE_STAGEMASK;
+       flags2 &= CE_STAGEMASK;
+
        if (flags1 < flags2)
                return -1;
        if (flags1 > flags2)
@@ -430,6 +447,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
        int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
        int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
        int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
+
        pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
 
        /* existing match? Just replace it. */
@@ -478,10 +496,12 @@ int add_cache_entry(struct cache_entry *ce, int option)
        return 0;
 }
 
-static int verify_hdr(struct cache_header *hdr, unsigned long size)
+static int verify_hdr(struct cache_header *hdr, unsigned long size, unsigned char *sha1)
 {
        SHA_CTX c;
-       unsigned char sha1[20];
+       unsigned char sha1_buf[20];
+       if (!sha1)
+               sha1 = sha1_buf;
 
        if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
                return error("bad signature");
@@ -495,7 +515,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
        return 0;
 }
 
-int read_cache(void)
+int read_cache_1(unsigned char *cache_sha1)
 {
        int fd, i;
        struct stat st;
@@ -529,7 +549,7 @@ int read_cache(void)
                die("index file mmap failed (%s)", strerror(errno));
 
        hdr = map;
-       if (verify_hdr(hdr, size) < 0)
+       if (verify_hdr(hdr, size, cache_sha1) < 0)
                goto unmap;
 
        active_nr = ntohl(hdr->hdr_entries);
@@ -577,7 +597,7 @@ static int ce_write(SHA_CTX *context, int fd, void *data, unsigned int len)
        return 0;
 }
 
-static int ce_flush(SHA_CTX *context, int fd)
+static int ce_flush(SHA_CTX *context, int fd, unsigned char *sha1)
 {
        unsigned int left = write_buffer_len;
 
@@ -594,7 +614,8 @@ static int ce_flush(SHA_CTX *context, int fd)
        }
 
        /* Append the SHA1 signature at the end */
-       SHA1_Final(write_buffer + left, context);
+       SHA1_Final(sha1, context);
+       memcpy(write_buffer + left, sha1, 20);
        left += 20;
        if (write(fd, write_buffer, left) != left)
                return -1;
@@ -645,11 +666,14 @@ static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
        }
 }
 
-int write_cache(int newfd, struct cache_entry **cache, int entries)
+int write_cache_1(int newfd, struct cache_entry **cache, int entries,
+                 unsigned char *cache_sha1)
 {
        SHA_CTX c;
        struct cache_header hdr;
        int i, removed;
+       int status;
+       unsigned char sha1[20];
 
        for (i = removed = 0; i < entries; i++)
                if (!cache[i]->ce_mode)
@@ -673,5 +697,18 @@ int write_cache(int newfd, struct cache_entry **cache, int entries)
                if (ce_write(&c, newfd, ce, ce_size(ce)) < 0)
                        return -1;
        }
-       return ce_flush(&c, newfd);
+       status = ce_flush(&c, newfd, sha1);
+       if (cache_sha1)
+               memcpy(cache_sha1, sha1, 20);
+       return status;
+}
+
+int read_cache(void)
+{
+       return read_cache_1(NULL);
+}
+
+int write_cache(int newfd, struct cache_entry **cache, int entries)
+{
+       return write_cache_1(newfd, cache, entries, NULL);
 }