Merge branch 'pe/cleanup' into next

diff --git a/revision.c b/revision.c
index 558ed01a5172d07c3af55ae2279d01bb0d6a5223..ce35b5a7e6960383debb4541c573ecf02d192cae 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -260,7 +260,7 @@ int rev_same_tree_as_empty(struct tree *t1)
        if (!t1)
                return 0;
 
-       tree = read_object_with_reference(t1->object.sha1, "tree", &real.size, NULL);
+       tree = read_object_with_reference(t1->object.sha1, tree_type, &real.size, NULL);
        if (!tree)
                return 0;
        real.buf = tree;
@@ -552,32 +552,26 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strncmp(arg, "--max-age=", 10)) {
                                revs->max_age = atoi(arg + 10);
-                               revs->limited = 1;
-                               continue;
-                       }
-                       if (!strncmp(arg, "--min-age=", 10)) {
-                               revs->min_age = atoi(arg + 10);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--since=", 8)) {
                                revs->max_age = approxidate(arg + 8);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--after=", 8)) {
                                revs->max_age = approxidate(arg + 8);
-                               revs->limited = 1;
+                               continue;
+                       }
+                       if (!strncmp(arg, "--min-age=", 10)) {
+                               revs->min_age = atoi(arg + 10);
                                continue;
                        }
                        if (!strncmp(arg, "--before=", 9)) {
                                revs->min_age = approxidate(arg + 9);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strncmp(arg, "--until=", 8)) {
                                revs->min_age = approxidate(arg + 8);
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--all")) {
@@ -596,13 +590,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "--topo-order")) {
                                revs->topo_order = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--date-order")) {
                                revs->lifo = 0;
                                revs->topo_order = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--parents")) {
@@ -644,7 +636,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                        }
                        if (!strcmp(arg, "--unpacked")) {
                                revs->unpacked = 1;
-                               revs->limited = 1;
                                continue;
                        }
                        *unrecognized++ = arg;
@@ -708,6 +699,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                add_one_commit(commit, revs);
        }
 
+       if (revs->topo_order || revs->unpacked)
+               revs->limited = 1;
+
        if (revs->prune_data) {
                diff_tree_setup_paths(revs->prune_data);
                revs->prune_fn = try_to_simplify_commit;
@@ -787,7 +781,10 @@ struct commit *get_revision(struct rev_info *revs)
                 * that we'd otherwise have done in limit_list().
                 */
                if (!revs->limited) {
-                       if (revs->max_age != -1 && (commit->date < revs->max_age))
+                       if ((revs->unpacked &&
+                            has_sha1_pack(commit->object.sha1)) ||
+                           (revs->max_age != -1 &&
+                            (commit->date < revs->max_age)))
                                continue;
                        add_parents_to_list(revs, commit, &revs->commits);
                }