Small fixes in Documentation/git-mv.txt

diff --git a/tree.c b/tree.c
index ca800a85f771be1bd10d6575d93ca05bd3fc381c..8b42a07b208aceeaa4900c034eea8a5b6b7ac323 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,5 +1,7 @@
 #include "tree.h"
 #include "blob.h"
+#include "commit.h"
+#include "tag.h"
 #include "cache.h"
 #include <stdlib.h>
 
@@ -18,11 +20,56 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
        memcpy(ce->name, base, baselen);
        memcpy(ce->name + baselen, pathname, len+1);
        memcpy(ce->sha1, sha1, 20);
-       return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
+       return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
+}
+
+static int match_tree_entry(const char *base, int baselen, const char *path, unsigned int mode, const char **paths)
+{
+       const char *match;
+       int pathlen;
+
+       if (!paths)
+               return 1;
+       pathlen = strlen(path);
+       while ((match = *paths++) != NULL) {
+               int matchlen = strlen(match);
+
+               if (baselen >= matchlen) {
+                       /* If it doesn't match, move along... */
+                       if (strncmp(base, match, matchlen))
+                               continue;
+                       /* The base is a subdirectory of a path which was specified. */
+                       return 1;
+               }
+
+               /* Does the base match? */
+               if (strncmp(base, match, baselen))
+                       continue;
+
+               match += baselen;
+               matchlen -= baselen;
+
+               if (pathlen > matchlen)
+                       continue;
+
+               if (matchlen > pathlen) {
+                       if (match[pathlen] != '/')
+                               continue;
+                       if (!S_ISDIR(mode))
+                               continue;
+               }
+
+               if (strncmp(path, match, pathlen))
+                       continue;
+
+               return 1;
+       }
+       return 0;
 }
 
 static int read_tree_recursive(void *buffer, unsigned long size,
-                              const char *base, int baselen, int stage)
+                              const char *base, int baselen,
+                              int stage, const char **match)
 {
        while (size) {
                int len = strlen(buffer)+1;
@@ -36,6 +83,9 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                buffer = sha1 + 20;
                size -= len + 20;
 
+               if (!match_tree_entry(base, baselen, path, mode, match))
+                       continue;
+
                if (S_ISDIR(mode)) {
                        int retval;
                        int pathlen = strlen(path);
@@ -55,7 +105,8 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                        newbase[baselen + pathlen] = '/';
                        retval = read_tree_recursive(eltbuf, eltsize,
                                                     newbase,
-                                                    baselen + pathlen + 1, stage);
+                                                    baselen + pathlen + 1,
+                                                    stage, match);
                        free(eltbuf);
                        free(newbase);
                        if (retval)
@@ -68,12 +119,12 @@ static int read_tree_recursive(void *buffer, unsigned long size,
        return 0;
 }
 
-int read_tree(void *buffer, unsigned long size, int stage)
+int read_tree(void *buffer, unsigned long size, int stage, const char **match)
 {
-       return read_tree_recursive(buffer, size, "", 0, stage);
+       return read_tree_recursive(buffer, size, "", 0, stage, match);
 }
 
-struct tree *lookup_tree(unsigned char *sha1)
+struct tree *lookup_tree(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
@@ -83,6 +134,8 @@ struct tree *lookup_tree(unsigned char *sha1)
                ret->object.type = tree_type;
                return ret;
        }
+       if (!obj->type)
+               obj->type = tree_type;
        if (obj->type != tree_type) {
                error("Object %s is a %s, not a tree", 
                      sha1_to_hex(sha1), obj->type);
@@ -95,6 +148,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;
@@ -116,6 +170,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;
 
@@ -130,11 +185,21 @@ int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
                        obj = &entry->item.blob->object;
                }
                if (obj)
-                       add_ref(&item->object, obj);
-
+                       n_refs++;
+               entry->parent = NULL; /* needs to be filled by the user */
                *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;
 }
 
@@ -160,3 +225,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);
+}