Merge branch 'jc/read-tree-safety'

diff --git a/merge-tree.c b/merge-tree.c
index 768d83a7c23d948dc85ada30a5226078d105ab08..9dcaab7a85fdb63b2140923a95b216917bfc0993 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -1,51 +1,11 @@
 #include "cache.h"
-#include "diff.h"
+#include "tree-walk.h"
 
 static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
 static int resolve_directories = 1;
 
 static void merge_trees(struct tree_desc t[3], const char *base);
 
-static void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
-{
-       unsigned long size = 0;
-       void *buf = NULL;
-
-       if (sha1) {
-               buf = read_object_with_reference(sha1, "tree", &size, NULL);
-               if (!buf)
-                       die("unable to read tree %s", sha1_to_hex(sha1));
-       }
-       desc->size = size;
-       desc->buf = buf;
-       return buf;
-}
-
-struct name_entry {
-       const unsigned char *sha1;
-       const char *path;
-       unsigned int mode;
-       int pathlen;
-};
-
-static void entry_clear(struct name_entry *a)
-{
-       memset(a, 0, sizeof(*a));
-}
-
-static int entry_compare(struct name_entry *a, struct name_entry *b)
-{
-       return base_name_compare(
-                       a->path, a->pathlen, a->mode,
-                       b->path, b->pathlen, b->mode);
-}
-
-static void entry_extract(struct tree_desc *t, struct name_entry *a)
-{
-       a->sha1 = tree_entry_extract(t, &a->path, &a->mode);
-       a->pathlen = strlen(a->path);
-}
-
 /* An empty entry never compares same, not even to another empty entry */
 static int same_entry(struct name_entry *a, struct name_entry *b)
 {
@@ -64,16 +24,14 @@ static const char *sha1_to_hex_zero(const unsigned char *sha1)
 
 static void resolve(const char *base, struct name_entry *branch1, struct name_entry *result)
 {
-       char branch1_sha1[50];
-
        /* If it's already branch1, don't bother showing it */
        if (!branch1)
                return;
-       memcpy(branch1_sha1, sha1_to_hex_zero(branch1->sha1), 41);
 
        printf("0 %06o->%06o %s->%s %s%s\n",
                branch1->mode, result->mode,
-               branch1_sha1, sha1_to_hex_zero(result->sha1),
+               sha1_to_hex_zero(branch1->sha1),
+               sha1_to_hex_zero(result->sha1),
                base, result->path);
 }
 
@@ -125,60 +83,6 @@ static void unresolved(const char *base, struct name_entry n[3])
                printf("3 %06o %s %s%s\n", n[2].mode, sha1_to_hex(n[2].sha1), base, n[2].path);
 }
 
-typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, const char *base);
-
-static void traverse_trees(int n, struct tree_desc *t, const char *base, traverse_callback_t callback)
-{
-       struct name_entry *entry = xmalloc(n*sizeof(*entry));
-
-       for (;;) {
-               struct name_entry entry[3];
-               unsigned long mask = 0;
-               int i, last;
-
-               last = -1;
-               for (i = 0; i < n; i++) {
-                       if (!t[i].size)
-                               continue;
-                       entry_extract(t+i, entry+i);
-                       if (last >= 0) {
-                               int cmp = entry_compare(entry+i, entry+last);
-
-                               /*
-                                * Is the new name bigger than the old one?
-                                * Ignore it
-                                */
-                               if (cmp > 0)
-                                       continue;
-                               /*
-                                * Is the new name smaller than the old one?
-                                * Ignore all old ones
-                                */
-                               if (cmp < 0)
-                                       mask = 0;
-                       }
-                       mask |= 1ul << i;
-                       last = i;
-               }
-               if (!mask)
-                       break;
-
-               /*
-                * Update the tree entries we've walked, and clear
-                * all the unused name-entries.
-                */
-               for (i = 0; i < n; i++) {
-                       if (mask & (1ul << i)) {
-                               update_tree_entry(t+i);
-                               continue;
-                       }
-                       entry_clear(entry + i);
-               }
-               callback(n, mask, entry, base);
-       }
-       free(entry);
-}
-
 /*
  * Merge two trees together (t[1] and t[2]), using a common base (t[0])
  * as the origin.
@@ -245,7 +149,7 @@ static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
        unsigned char sha1[20];
        void *buf;
 
-       if (get_sha1(rev, sha1) < 0)
+       if (get_sha1(rev, sha1))
                die("unknown rev %s", rev);
        buf = fill_tree_descriptor(desc, sha1);
        if (!buf)