Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree

diff --git a/revision.c b/revision.c
index 2294b16ea2aa0b508073e7800ccb5975a2254301..c51ea833f94f96b0cc0199f27a6b72f9e78ddb26 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -63,14 +63,13 @@ void mark_tree_uninteresting(struct tree *tree)
                return;
        if (parse_tree(tree) < 0)
                die("bad tree %s", sha1_to_hex(obj->sha1));
-       entry = tree->entries;
-       tree->entries = NULL;
+       entry = create_tree_entry_list(tree);
        while (entry) {
                struct tree_entry_list *next = entry->next;
                if (entry->directory)
-                       mark_tree_uninteresting(entry->item.tree);
+                       mark_tree_uninteresting(lookup_tree(entry->sha1));
                else
-                       mark_blob_uninteresting(entry->item.blob);
+                       mark_blob_uninteresting(lookup_blob(entry->sha1));
                free(entry);
                entry = next;
        }
@@ -733,6 +732,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->abbrev = DEFAULT_ABBREV;
                                continue;
                        }
+                       if (!strncmp(arg, "--abbrev=", 9)) {
+                               revs->abbrev = strtoul(arg + 9, NULL, 10);
+                               if (revs->abbrev < MINIMUM_ABBREV)
+                                       revs->abbrev = MINIMUM_ABBREV;
+                               else if (revs->abbrev > 40)
+                                       revs->abbrev = 40;
+                               continue;
+                       }
                        if (!strcmp(arg, "--abbrev-commit")) {
                                revs->abbrev_commit = 1;
                                continue;