revision: --topo-order and --unpacked

Now, using --unpacked without limit_list() does not make much
sense, but this is parallel to the earlier --max-age fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/revision.c b/revision.c
index 558ed01a5172d07c3af55ae2279d01bb0d6a5223..07cc86ffcfac577e05aeafefe31e6b5b902b0a6e 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -787,7 +787,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);
                }