Apply suggestions from code review
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/src/libgit2/branch.c b/src/libgit2/branch.c
index 5660a1d..2dd7d2b 100644
--- a/src/libgit2/branch.c
+++ b/src/libgit2/branch.c
@@ -53,7 +53,7 @@ static int not_a_local_branch(const char *reference_name)
return -1;
}
-static bool branch_name_follows_pattern(const char *branch_name)
+static bool branch_name_is_valid(const char *branch_name)
{
/*
* Discourage branch name starting with dash,
@@ -84,7 +84,7 @@ static int create_branch(
GIT_ASSERT_ARG(ref_out);
GIT_ASSERT_ARG(git_commit_owner(commit) == repository);
- if (!branch_name_follows_pattern(branch_name)) {
+ if (!branch_name_is_valid(branch_name)) {
git_error_set(GIT_ERROR_REFERENCE, "'%s' is not a valid branch name", branch_name);
error = -1;
goto cleanup;
@@ -808,7 +808,7 @@ int git_branch_name_is_valid(int *valid, const char *name)
*valid = 0;
- if (!name || !branch_name_follows_pattern(name))
+ if (!name || !branch_name_is_valid(name))
goto done;
if ((error = git_str_puts(&ref_name, GIT_REFS_HEADS_DIR)) < 0 ||
diff --git a/src/libgit2/tag.c b/src/libgit2/tag.c
index b350336..3d8f8bf 100644
--- a/src/libgit2/tag.c
+++ b/src/libgit2/tag.c
@@ -244,7 +244,7 @@ on_error:
return -1;
}
-static bool tag_name_follows_pattern(const char *tag_name)
+static bool tag_name_is_valid(const char *tag_name)
{
/*
* Discourage tag name starting with dash,
@@ -278,7 +278,7 @@ static int git_tag_create__internal(
return -1;
}
- if (!tag_name_follows_pattern(tag_name)) {
+ if (!tag_name_is_valid(tag_name)) {
git_error_set(GIT_ERROR_TAG, "'%s' is not a valid tag name", tag_name);
return -1;
}
@@ -554,7 +554,7 @@ int git_tag_name_is_valid(int *valid, const char *name)
GIT_ASSERT(valid);
- if (!name || !tag_name_follows_pattern(name))
+ if (!name || !tag_name_is_valid(name))
goto done;
if ((error = git_str_puts(&ref_name, GIT_REFS_TAGS_DIR)) < 0 ||