diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:45:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:45:19 -0700 |
| commit | 9c81e6421bca19ef779e84dbf9ebf148e1c1201f (patch) | |
| tree | f3bcbbe60de6c4567f3b30b3d0caf5a6ec3565b1 /builtin | |
| parent | Merge branch 'dz/connect-error-report' (diff) | |
| parent | Revert clock-skew based attempt to optimize tag --contains traversal (diff) | |
| download | tgif-9c81e6421bca19ef779e84dbf9ebf148e1c1201f.tar.xz | |
Merge branch 'jk/tag-contains-ab'
* jk/tag-contains-ab:
Revert clock-skew based attempt to optimize tag --contains traversal
git skew: a tool to find how big a clock skew exists in the history
default core.clockskew variable to one day
limit "contains" traversals based on commit timestamp
tag: speed up --contains calculation
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/tag.c | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index cef27263bc..667515e527 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -12,6 +12,8 @@ #include "tag.h" #include "run-command.h" #include "parse-options.h" +#include "diff.h" +#include "revision.h" static const char * const git_tag_usage[] = { "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]", @@ -40,6 +42,48 @@ static int match_pattern(const char **patterns, const char *ref) return 0; } +static int in_commit_list(const struct commit_list *want, struct commit *c) +{ + for (; want; want = want->next) + if (!hashcmp(want->item->object.sha1, c->object.sha1)) + return 1; + return 0; +} + +static int contains_recurse(struct commit *candidate, + const struct commit_list *want) +{ + struct commit_list *p; + + /* was it previously marked as containing a want commit? */ + if (candidate->object.flags & TMP_MARK) + return 1; + /* or marked as not possibly containing a want commit? */ + if (candidate->object.flags & UNINTERESTING) + return 0; + /* or are we it? */ + if (in_commit_list(want, candidate)) + return 1; + + if (parse_commit(candidate) < 0) + return 0; + + /* Otherwise recurse and mark ourselves for future traversals. */ + for (p = candidate->parents; p; p = p->next) { + if (contains_recurse(p->item, want)) { + candidate->object.flags |= TMP_MARK; + return 1; + } + } + candidate->object.flags |= UNINTERESTING; + return 0; +} + +static int contains(struct commit *candidate, const struct commit_list *want) +{ + return contains_recurse(candidate, want); +} + static int show_reference(const char *refname, const unsigned char *sha1, int flag, void *cb_data) { @@ -58,7 +102,7 @@ static int show_reference(const char *refname, const unsigned char *sha1, commit = lookup_commit_reference_gently(sha1, 1); if (!commit) return 0; - if (!is_descendant_of(commit, filter->with_commit)) + if (!contains(commit, filter->with_commit)) return 0; } |