diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-30 19:38:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-30 19:38:50 -0800 |
| commit | 83877f8d92b2050eb668dc3351277e57779a8f05 (patch) | |
| tree | deedf7e97c113e09a4cb58f4ba25c0339b318279 /revision.c | |
| parent | 6fb75bed5c4a6ce099a24e581ea327e9de3ab8b0 (diff) | |
| parent | 9dad9d2e5b322835c87e1653268d892a95ee0f1f (diff) | |
| download | git-83877f8d92b2050eb668dc3351277e57779a8f05.tar.gz git-83877f8d92b2050eb668dc3351277e57779a8f05.tar.xz | |
Merge branch 'maint'
* maint:
revision traversal: --unpacked does not limit commit list anymore.
Continue traversal when rev-list --unpacked finds a packed commit.
Use memmove instead of memcpy for overlapping areas
quote.c: ensure the same quoting across platforms.
Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/revision.c b/revision.c index f1e0caaae..04fa7e517 100644 --- a/revision.c +++ b/revision.c @@ -418,9 +418,6 @@ static void limit_list(struct rev_info *revs) if (revs->max_age != -1 && (commit->date < revs->max_age)) obj->flags |= UNINTERESTING; - if (revs->unpacked && - has_sha1_pack(obj->sha1, revs->ignore_packed)) - obj->flags |= UNINTERESTING; add_parents_to_list(revs, commit, &list); if (obj->flags & UNINTERESTING) { mark_parents_uninteresting(commit); @@ -1015,7 +1012,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch add_pending_object(revs, object, def); } - if (revs->topo_order || revs->unpacked) + if (revs->topo_order) revs->limited = 1; if (revs->prune_data) { @@ -1149,17 +1146,18 @@ struct commit *get_revision(struct rev_info *revs) * that we'd otherwise have done in limit_list(). */ if (!revs->limited) { - if ((revs->unpacked && - has_sha1_pack(commit->object.sha1, - revs->ignore_packed)) || - (revs->max_age != -1 && - (commit->date < revs->max_age))) + if (revs->max_age != -1 && + (commit->date < revs->max_age)) continue; add_parents_to_list(revs, commit, &revs->commits); } if (commit->object.flags & SHOWN) continue; + if (revs->unpacked && has_sha1_pack(commit->object.sha1, + revs->ignore_packed)) + continue; + /* We want to show boundary commits only when their * children are shown. When path-limiter is in effect, * rewrite_parents() drops some commits from getting shown, |