summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-02 02:52:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-02 02:55:56 (GMT)
commit22c31bf183bff576c7807f9d67abfc11ee8e1fa4 (patch)
tree0198d0e7bca000169dd5b3377b007bc67c1d9190
parentbe7db6e574b95c70ac544c78d74fdeea0fb4058d (diff)
downloadgit-22c31bf183bff576c7807f9d67abfc11ee8e1fa4.zip
git-22c31bf183bff576c7807f9d67abfc11ee8e1fa4.tar.gz
git-22c31bf183bff576c7807f9d67abfc11ee8e1fa4.tar.bz2
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>
-rw-r--r--revision.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 558ed01..07cc86f 100644
--- 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);
}