[PATCH] Improve git-update-index error reporting

[git.git] / rev-list.c

diff --git a/rev-list.c b/rev-list.c
index c410bc3..e41d5a0 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -147,11 +147,16 @@ static struct object_list **process_tree(struct tree *tree, struct object_list *
                die("bad tree object %s", sha1_to_hex(obj->sha1));
        obj->flags |= SEEN;
        p = add_object(obj, p, name);
-       for (entry = tree->entries ; entry ; entry = entry->next) {
+       entry = tree->entries;
+       tree->entries = NULL;
+       while (entry) {
+               struct tree_entry_list *next = entry->next;
                if (entry->directory)
                        p = process_tree(entry->item.tree, p, entry->name);
                else
                        p = process_blob(entry->item.blob, p, entry->name);
+               free(entry);
+               entry = next;
        }
        return p;
 }
@@ -218,12 +223,15 @@ static void mark_tree_uninteresting(struct tree *tree)
        if (parse_tree(tree) < 0)
                die("bad tree %s", sha1_to_hex(obj->sha1));
        entry = tree->entries;
+       tree->entries = NULL;
        while (entry) {
+               struct tree_entry_list *next = entry->next;
                if (entry->directory)
                        mark_tree_uninteresting(entry->item.tree);
                else
                        mark_blob_uninteresting(entry->item.blob);
-               entry = entry->next;
+               free(entry);
+               entry = next;
        }
 }
 
@@ -553,6 +561,8 @@ int main(int argc, char **argv)
                        struct commit *exclude = NULL;
                        struct commit *include = NULL;
                        *dotdot = 0;
+                       if (!*next)
+                               next = "HEAD";
                        exclude = get_commit_reference(arg, UNINTERESTING);
                        include = get_commit_reference(next, 0);
                        if (exclude && include) {
@@ -561,7 +571,7 @@ int main(int argc, char **argv)
                                handle_one_commit(include, &list);
                                continue;
                        }
-                       *next = '.';
+                       *dotdot = '.';
                }
                if (*arg == '^') {
                        flags = UNINTERESTING;
@@ -573,6 +583,7 @@ int main(int argc, char **argv)
        }
 
        save_commit_buffer = verbose_header;
+       track_object_refs = 0;
 
        if (!merge_order) {             
                sort_by_date(&list);