[PATCH] Fix +x-related show-diff false positives

[git.git] / update-cache.c

diff --git a/update-cache.c b/update-cache.c
index 6d37c55..7c3a143 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -14,13 +14,13 @@
  */
 static int allow_add = 0, allow_remove = 0;
 
-static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st)
+static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 {
        z_stream stream;
        unsigned long size = st->st_size;
-       int max_out_bytes = namelen + size + 200;
+       int max_out_bytes = size + 200;
        void *out = malloc(max_out_bytes);
-       void *metadata = malloc(namelen + 200);
+       void *metadata = malloc(200);
        void *in;
        SHA_CTX c;
 
@@ -56,9 +56,9 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
        
        SHA1_Init(&c);
        SHA1_Update(&c, out, stream.total_out);
-       SHA1_Final(ce->sha1, &c);
+       SHA1_Final(sha1, &c);
 
-       return write_sha1_buffer(ce->sha1, out, stream.total_out);
+       return write_sha1_buffer(sha1, out, stream.total_out);
 }
 
 /*
@@ -68,18 +68,17 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
  */
 static void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 {
-       ce->ctime.sec = st->st_ctime;
+       ce->ce_ctime.sec = htonl(st->st_ctime);
+       ce->ce_mtime.sec = htonl(st->st_mtime);
 #ifdef NSEC
-       ce->ctime.nsec = st->st_ctim.tv_nsec;
+       ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec);
+       ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec);
 #endif
-       ce->mtime.sec = st->st_mtime;
-#ifdef NSEC
-       ce->mtime.nsec = st->st_mtim.tv_nsec;
-#endif
-       ce->st_dev = st->st_dev;
-       ce->st_ino = st->st_ino;
-       ce->st_uid = st->st_uid;
-       ce->st_gid = st->st_gid;
+       ce->ce_dev = htonl(st->st_dev);
+       ce->ce_ino = htonl(st->st_ino);
+       ce->ce_uid = htonl(st->st_uid);
+       ce->ce_gid = htonl(st->st_gid);
+       ce->ce_size = htonl(st->st_size);
 }
 
 static int add_file_to_cache(char *path)
@@ -107,11 +106,10 @@ static int add_file_to_cache(char *path)
        memset(ce, 0, size);
        memcpy(ce->name, path, namelen);
        fill_stat_cache_info(ce, &st);
-       ce->st_mode = st.st_mode;
-       ce->st_size = st.st_size;
-       ce->namelen = namelen;
+       ce->ce_mode = create_ce_mode(st.st_mode);
+       ce->ce_flags = htons(namelen);
 
-       if (index_fd(path, namelen, ce, fd, &st) < 0)
+       if (index_fd(ce->sha1, fd, &st) < 0)
                return -1;
 
        return add_cache_entry(ce, allow_add);
@@ -190,7 +188,6 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
        updated = malloc(size);
        memcpy(updated, ce, size);
        fill_stat_cache_info(updated, &st);
-       updated->st_size = st.st_size;
        return updated;
 }
 
@@ -238,6 +235,32 @@ inside:
        }
 }
 
+static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
+{
+       int size, len;
+       unsigned int mode;
+       unsigned char sha1[20];
+       struct cache_entry *ce;
+
+       if (sscanf(arg1, "%o", &mode) != 1)
+               return -1;
+       if (get_sha1_hex(arg2, sha1))
+               return -1;
+       if (!verify_path(arg3))
+               return -1;
+
+       len = strlen(arg3);
+       size = cache_entry_size(len);
+       ce = malloc(size);
+       memset(ce, 0, size);
+
+       memcpy(ce->sha1, sha1, 20);
+       memcpy(ce->name, arg3, len);
+       ce->ce_flags = htons(len);
+       ce->ce_mode = create_ce_mode(mode);
+       return add_cache_entry(ce, allow_add);
+}
+
 static int remove_lock = 0;
 
 static void remove_lock_file(void)
@@ -282,6 +305,12 @@ int main(int argc, char **argv)
                                refresh_cache();
                                continue;
                        }
+                       if (!strcmp(path, "--cacheinfo")) {
+                               if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
+                                       die("update-cache: --cacheinfo <mode> <sha1> <path>");
+                               i += 3;
+                               continue;
+                       }
                        die("unknown option %s", path);
                }
                if (!verify_path(path)) {