[PATCH] git-fsck-cache: Gracefully handle non-commit IDs

[git.git] / update-cache.c

diff --git a/update-cache.c b/update-cache.c
index 4353b80..16e1bb9 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#include <signal.h>
 #include "cache.h"
 
 /*
@@ -12,15 +13,31 @@
  * like "update-cache *" and suddenly having all the object
  * files be revision controlled.
  */
-static int allow_add = 0, allow_remove = 0;
+static int allow_add = 0, allow_remove = 0, not_new = 0;
+
+/* Three functions to allow overloaded pointer return; see linux/err.h */
+static inline void *ERR_PTR(long error)
+{
+       return (void *) error;
+}
+
+static inline long PTR_ERR(const void *ptr)
+{
+       return (long) ptr;
+}
+
+static inline long IS_ERR(const void *ptr)
+{
+       return (unsigned long)ptr > (unsigned long)-1000L;
+}
 
 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 = size + 200;
-       void *out = malloc(max_out_bytes);
-       void *metadata = malloc(200);
+       void *out = xmalloc(max_out_bytes);
+       void *metadata = xmalloc(200);
        int metadata_size;
        void *in;
        SHA_CTX c;
@@ -106,7 +123,7 @@ static int add_file_to_cache(char *path)
        }
        namelen = strlen(path);
        size = cache_entry_size(namelen);
-       ce = malloc(size);
+       ce = xmalloc(size);
        memset(ce, 0, size);
        memcpy(ce->name, path, namelen);
        fill_stat_cache_info(ce, &st);
@@ -172,7 +189,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
        int changed, size;
 
        if (stat(ce->name, &st) < 0)
-               return NULL;
+               return ERR_PTR(-errno);
 
        changed = cache_match_stat(ce, &st);
        if (!changed)
@@ -183,13 +200,13 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
         * to refresh the entry - it's not going to match
         */
        if (changed & MODE_CHANGED)
-               return NULL;
+               return ERR_PTR(-EINVAL);
 
        if (compare_data(ce, st.st_size))
-               return NULL;
+               return ERR_PTR(-EINVAL);
 
        size = ce_size(ce);
-       updated = malloc(size);
+       updated = xmalloc(size);
        memcpy(updated, ce, size);
        fill_stat_cache_info(updated, &st);
        return updated;
@@ -212,8 +229,9 @@ static void refresh_cache(void)
                }
 
                new = refresh_entry(ce);
-               if (!new) {
-                       printf("%s: needs update\n", ce->name);
+               if (IS_ERR(new)) {
+                       if (!(not_new && PTR_ERR(new) == -ENOENT))
+                               printf("%s: needs update\n", ce->name);
                        continue;
                }
                active_cache[i] = new;
@@ -264,7 +282,7 @@ static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
 
        len = strlen(arg3);
        size = cache_entry_size(len);
-       ce = malloc(size);
+       ce = xmalloc(size);
        memset(ce, 0, size);
 
        memcpy(ce->sha1, sha1, 20);
@@ -282,6 +300,11 @@ static void remove_lock_file(void)
                unlink(lockfile_name);
 }
 
+static void remove_lock_file_on_signal(int signo)
+{
+       remove_lock_file();
+}
+
 int main(int argc, char **argv)
 {
        int i, newfd, entries;
@@ -295,6 +318,7 @@ int main(int argc, char **argv)
        if (newfd < 0)
                die("unable to create new cachefile");
 
+       signal(SIGINT, remove_lock_file_on_signal);
        atexit(remove_lock_file);
        lockfile_name = lockfile;
 
@@ -328,6 +352,10 @@ int main(int argc, char **argv)
                                i += 3;
                                continue;
                        }
+                       if (!strcmp(path, "--ignore-missing")) {
+                               not_new = 1;
+                               continue;
+                       }
                        die("unknown option %s", path);
                }
                if (!verify_path(path)) {