git-push: avoid falling back on pushing "matching" refs.

diff --git a/tree.c b/tree.c
index dabc2e7a2c6f51255914d49f854d82e42ddcab77..dc1c41e938b6475df3611294c17ff923be72a72d 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,15 +1,24 @@
+#include "cache.h"
 #include "tree.h"
 #include "blob.h"
-#include "cache.h"
+#include "commit.h"
+#include "tag.h"
 #include <stdlib.h>
 
 const char *tree_type = "tree";
 
 static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
-       int len = strlen(pathname);
-       unsigned int size = cache_entry_size(baselen + len);
-       struct cache_entry *ce = xmalloc(size);
+       int len;
+       unsigned int size;
+       struct cache_entry *ce;
+
+       if (S_ISDIR(mode))
+               return READ_TREE_RECURSIVE;
+
+       len = strlen(pathname);
+       size = cache_entry_size(baselen + len);
+       ce = xmalloc(size);
 
        memset(ce, 0, size);
 
@@ -65,9 +74,10 @@ static int match_tree_entry(const char *base, int baselen, const char *path, uns
        return 0;
 }
 
-static int read_tree_recursive(void *buffer, unsigned long size,
-                              const char *base, int baselen,
-                              int stage, const char **match)
+int read_tree_recursive(void *buffer, unsigned long size,
+                       const char *base, int baselen,
+                       int stage, const char **match,
+                       read_tree_fn_t fn)
 {
        while (size) {
                int len = strlen(buffer)+1;
@@ -84,6 +94,14 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                if (!match_tree_entry(base, baselen, path, mode, match))
                        continue;
 
+               switch (fn(sha1, base, baselen, path, mode, stage)) {
+               case 0:
+                       continue;
+               case READ_TREE_RECURSIVE:
+                       break;;
+               default:
+                       return -1;
+               }
                if (S_ISDIR(mode)) {
                        int retval;
                        int pathlen = strlen(path);
@@ -104,22 +122,20 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                        retval = read_tree_recursive(eltbuf, eltsize,
                                                     newbase,
                                                     baselen + pathlen + 1,
-                                                    stage, match);
+                                                    stage, match, fn);
                        free(eltbuf);
                        free(newbase);
                        if (retval)
                                return -1;
                        continue;
                }
-               if (read_one_entry(sha1, base, baselen, path, mode, stage) < 0)
-                       return -1;
        }
        return 0;
 }
 
 int read_tree(void *buffer, unsigned long size, int stage, const char **match)
 {
-       return read_tree_recursive(buffer, size, "", 0, stage, match);
+       return read_tree_recursive(buffer, size, "", 0, stage, match, read_one_entry);
 }
 
 struct tree *lookup_tree(const unsigned char *sha1)
@@ -146,6 +162,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
 {
        void *bufptr = buffer;
        struct tree_entry_list **list_p;
+       int n_refs = 0;
 
        if (item->object.parsed)
                return 0;
@@ -167,6 +184,7 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
                entry->directory = S_ISDIR(mode) != 0;
                entry->executable = (mode & S_IXUSR) != 0;
                entry->symlink = S_ISLNK(mode) != 0;
+               entry->zeropad = *(char *)bufptr == '0';
                entry->mode = mode;
                entry->next = NULL;
 
@@ -181,11 +199,20 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
                        obj = &entry->item.blob->object;
                }
                if (obj)
-                       add_ref(&item->object, obj);
-               entry->parent = NULL; /* needs to be filled by the user */
+                       n_refs++;
                *list_p = entry;
                list_p = &entry->next;
        }
+
+       if (track_object_refs) {
+               struct tree_entry_list *entry;
+               unsigned i = 0;
+               struct object_refs *refs = alloc_object_refs(n_refs);
+               for (entry = item->entries; entry; entry = entry->next)
+                       refs->ref[i++] = entry->item.any;
+               set_object_refs(&item->object, refs);
+       }
+
        return 0;
 }
 
@@ -211,3 +238,22 @@ int parse_tree(struct tree *item)
        free(buffer);
        return ret;
 }
+
+struct tree *parse_tree_indirect(const unsigned char *sha1)
+{
+       struct object *obj = parse_object(sha1);
+       do {
+               if (!obj)
+                       return NULL;
+               if (obj->type == tree_type)
+                       return (struct tree *) obj;
+               else if (obj->type == commit_type)
+                       obj = &(((struct commit *) obj)->tree->object);
+               else if (obj->type == tag_type)
+                       obj = ((struct tag *) obj)->tagged;
+               else
+                       return NULL;
+               if (!obj->parsed)
+                       parse_object(obj->sha1);
+       } while (1);
+}