Subject: [PATCH 2/3] Make has_commit non-static

From: Jake Goulding <[email-masked]>
Date: Thu, 22 Jan 2009 19:48:36 -0500

Moving has_commit from branch to a common location in preparation for
using it in tag.

Signed-off-by: Jake Goulding <[email-masked]>
---
 builtin-branch.c |   15 ---------------
 commit.c         |   15 +++++++++++++++
 commit.h         |    1 +
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/builtin-branch.c b/builtin-branch.c
index 82d6fb2..bb42911 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);
diff --git a/commit.c b/commit.c
index c99db16..5ccb338 100644
--- a/commit.c
+++ b/commit.c
@@ -705,6 +705,21 @@ struct commit_list *get_merge_bases(struct commit
*one, struct commit *two,
 	return get_merge_bases_many(one, 1, &two, cleanup);
 }

+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;
+}
+
 int in_merge_bases(struct commit *commit, struct commit **reference,
int num)
 {
 	struct commit_list *bases, *b;
diff --git a/commit.h b/commit.h
index 3a7b06a..1b8444f 100644
--- a/commit.h
+++ b/commit.h
@@ -133,6 +133,7 @@ extern int is_repository_shallow(void);
 extern struct commit_list *get_shallow_commits(struct object_array *heads,
 		int depth, int shallow_flag, int not_shallow_flag);

+int has_commit(struct commit *, struct commit_list *);
 int in_merge_bases(struct commit *, struct commit **, int);

 extern int interactive_add(int argc, const char **argv, const char
*prefix);
-- 
1.6.0.4