refs.c: add a public is_branch function

Both refs.c and fsck.c have their own private copies of the is_branch function.
Delete the is_branch function from fsck.c and make the version in refs.c
public.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 8aadca160e857be8a87ec1f152e51eb6f51c90b5..d42a27da89d8d5693c6335cf4e2123d41c030580 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -481,11 +481,6 @@ static int fsck_handle_reflog(const char *logname, const unsigned char *sha1, in
        return 0;
 }
 
        return 0;
 }
 

-static int is_branch(const char *refname)
-{
-       return !strcmp(refname, "HEAD") || starts_with(refname, "refs/heads/");
-}
-

 static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 {
        struct object *obj;
 static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 {
        struct object *obj;

diff --git a/refs.c b/refs.c
index 59fb70087a438a763cdbfb2c4e75de36d533aead..d0ddf5608ac1091766b0960364e6a1ef625829a5 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2810,7 +2810,7 @@ static int log_ref_write(const char *refname, const unsigned char *old_sha1,
        return 0;
 }
 
        return 0;
 }
 

-static int is_branch(const char *refname)
+int is_branch(const char *refname)

 {
        return !strcmp(refname, "HEAD") || starts_with(refname, "refs/heads/");
 }
 {
        return !strcmp(refname, "HEAD") || starts_with(refname, "refs/heads/");
 }

diff --git a/refs.h b/refs.h
index 1440acc06ce59f35d23719adef18774731efe5a4..1b223e58a19f613885da62a9441786d76b30bdf9 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -137,6 +137,8 @@ extern int repack_without_refs(const char **refnames, int n);
 
 extern int ref_exists(const char *);
 
 
 extern int ref_exists(const char *);
 

+extern int is_branch(const char *refname);
+

 /*
  * If refname is a non-symbolic reference that refers to a tag object,
  * and the tag can be (recursively) dereferenced to a non-tag object,
 /*
  * If refname is a non-symbolic reference that refers to a tag object,
  * and the tag can be (recursively) dereferenced to a non-tag object,