X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=revision.c;h=67ff4de2d1e70e061aebc834e7b9632c8d7bf6cb;hb=f64c429ff75a1f53945b508f77e5f8f157a024c2;hp=d61410bc59bd6698d1aba4deb37faf75b31e3242;hpb=27a3f33945d0ee72adfee8f8589a88ba6be182a4;p=git.git diff --git a/revision.c b/revision.c index d61410bc..67ff4de2 100644 --- a/revision.c +++ b/revision.c @@ -143,8 +143,10 @@ static struct commit *get_commit_reference(struct rev_info *revs, const char *na object->flags |= flags; if (parse_commit(commit) < 0) die("unable to parse commit %s", name); - if (flags & UNINTERESTING) + if (flags & UNINTERESTING) { mark_parents_uninteresting(commit); + revs->limited = 1; + } return commit; } @@ -255,10 +257,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs) } 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 (!strcmp(arg, "--all")) { @@ -277,11 +281,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs) } 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, "--dense")) { @@ -309,6 +315,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs) revs->edge_hint = 1; continue; } + if (!strcmp(arg, "--unpacked")) { + revs->unpacked = 1; + revs->limited = 1; + continue; + } *unrecognized++ = arg; left++; continue; @@ -365,6 +376,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs) commit = get_commit_reference(revs, def, sha1, 0); add_one_commit(commit, revs); } + if (revs->paths) + revs->limited = 1; *unrecognized = NULL; return left; }