[PATCH] Make git-update-cache --refresh fail if update/merge needed.

diff --git a/read-tree.c b/read-tree.c
index 53351f05c74cb892530c2d351592cc0cc1a1274c..f8dc509a1f999fcbcccc6936477ddc80c9d063cc 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -7,84 +7,23 @@
 
 static int stage = 0;
 
-static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode)
-{
-       int len = strlen(pathname);
-       unsigned int size = cache_entry_size(baselen + len);
-       struct cache_entry *ce = malloc(size);
-
-       memset(ce, 0, size);
-
-       ce->ce_mode = create_ce_mode(mode);
-       ce->ce_flags = create_ce_flags(baselen + len, stage);
-       memcpy(ce->name, base, baselen);
-       memcpy(ce->name + baselen, pathname, len+1);
-       memcpy(ce->sha1, sha1, 20);
-       return add_cache_entry(ce, 1);
-}
-
-static int read_tree_recursive(void *buffer, const char *type,
-                              unsigned long size,
-                              const char *base, int baselen)
-{
-       if (!buffer || strcmp(type, "tree"))
-               return -1;
-       while (size) {
-               int len = strlen(buffer)+1;
-               unsigned char *sha1 = buffer + len;
-               char *path = strchr(buffer, ' ')+1;
-               unsigned int mode;
-
-               if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
-                       return -1;
-
-               buffer = sha1 + 20;
-               size -= len + 20;
-
-               if (S_ISDIR(mode)) {
-                       int retval;
-                       int pathlen = strlen(path);
-                       char *newbase = malloc(baselen + 1 + pathlen);
-                       void *eltbuf;
-                       char elttype[20];
-                       unsigned long eltsize;
-
-                       eltbuf = read_sha1_file(sha1, elttype, &eltsize);
-                       if (!eltbuf)
-                               return -1;
-                       memcpy(newbase, base, baselen);
-                       memcpy(newbase + baselen, path, pathlen);
-                       newbase[baselen + pathlen] = '/';
-                       retval = read_tree_recursive(eltbuf, elttype, eltsize,
-                                                    newbase,
-                                                    baselen + pathlen + 1);
-                       free(eltbuf);
-                       free(newbase);
-                       if (retval)
-                               return -1;
-                       continue;
-               }
-               if (read_one_entry(sha1, base, baselen, path, mode) < 0)
-                       return -1;
-       }
-       return 0;
-}
-
-static int read_tree(unsigned char *sha1, const char *base, int baselen)
+static int unpack_tree(unsigned char *sha1)
 {
        void *buffer;
        unsigned long size;
 
-       buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
-       return read_tree_recursive(buffer, "tree", size, base, baselen);
+       buffer = read_object_with_reference(sha1, "tree", &size, 0);
+       if (!buffer)
+               return -1;
+       return read_tree(buffer, size, stage);
 }
 
-static int remove_lock = 0;
+static char *lockfile_name;
 
 static void remove_lock_file(void)
 {
-       if (remove_lock)
-               unlink(".git/index.lock");
+       if (lockfile_name)
+               unlink(lockfile_name);
 }
 
 static int path_matches(struct cache_entry *a, struct cache_entry *b)
@@ -223,12 +162,16 @@ int main(int argc, char **argv)
 {
        int i, newfd, merge;
        unsigned char sha1[20];
+       static char lockfile[MAXPATHLEN+1];
+       const char *indexfile = get_index_file();
+
+       snprintf(lockfile, sizeof(lockfile), "%s.lock", indexfile);
 
-       newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
+       newfd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, 0600);
        if (newfd < 0)
                die("unable to create new cachefile");
        atexit(remove_lock_file);
-       remove_lock = 1;
+       lockfile_name = lockfile;
 
        merge = 0;
        for (i = 1; i < argc; i++) {
@@ -248,11 +191,11 @@ int main(int argc, char **argv)
                        merge = 1;
                        continue;
                }
-               if (get_sha1_hex(arg, sha1) < 0)
+               if (get_sha1(arg, sha1) < 0)
                        usage(read_tree_usage);
                if (stage > 3)
                        usage(read_tree_usage);
-               if (read_tree(sha1, "", 0) < 0)
+               if (unpack_tree(sha1) < 0)
                        die("failed to unpack tree object %s", arg);
                stage++;
        }
@@ -268,9 +211,8 @@ int main(int argc, char **argv)
                        die("just how do you expect me to merge %d trees?", stage-1);
                }
        }
-       if (write_cache(newfd, active_cache, active_nr) ||
-           rename(".git/index.lock", ".git/index"))
+       if (write_cache(newfd, active_cache, active_nr) || rename(lockfile, indexfile))
                die("unable to write new index file");
-       remove_lock = 0;
+       lockfile_name = NULL;
        return 0;
 }