diff options
| author | Jake Goulding <goulding@vivisimo.com> | 2009-01-26 09:13:24 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 11:33:03 -0800 |
| commit | 7fcdb36e29f9a5e779bc9e44cd69f8f69fac9426 (patch) | |
| tree | 0174c7c8187f04c75aa936211ca73ff44346881e /builtin-branch.c | |
| parent | 269defdf30a4beb48f230e36f20d00ee40348ab6 (diff) | |
| download | git-7fcdb36e29f9a5e779bc9e44cd69f8f69fac9426.tar.gz git-7fcdb36e29f9a5e779bc9e44cd69f8f69fac9426.tar.xz | |
Make has_commit() non-static
Move has_commit() from branch to a common location, in preparation for
using it in "git-tag". Rename it to is_descendant_of() to make it more
unique and descriptive.
Signed-off-by: Jake Goulding <goulding@vivisimo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 82d6fb27c..56a1971d6 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -193,21 +193,6 @@ struct ref_list { int kinds; }; -static int has_commit(struct commit *commit, struct commit_list *with_commit) -{ - if (!with_commit) - return 1; - while (with_commit) { - struct commit *other; - - other = with_commit->item; - with_commit = with_commit->next; - if (in_merge_bases(other, &commit, 1)) - return 1; - } - return 0; -} - static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct ref_list *ref_list = (struct ref_list*)(cb_data); @@ -231,7 +216,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags, return error("branch '%s' does not point at a commit", refname); /* Filter with with_commit if specified */ - if (!has_commit(commit, ref_list->with_commit)) + if (!is_descendant_of(commit, ref_list->with_commit)) return 0; /* Don't add types the caller doesn't want */ @@ -401,7 +386,8 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp); detached = (detached && (kinds & REF_LOCAL_BRANCH)); - if (detached && head_commit && has_commit(head_commit, with_commit)) { + if (detached && head_commit && + is_descendant_of(head_commit, with_commit)) { struct ref_item item; item.name = xstrdup("(no branch)"); item.kind = REF_LOCAL_BRANCH; |