Skip to content

Commit 55a7117

Browse files
committed
remote: use git_remote_name_is_valid
1 parent 023ebb9 commit 55a7117

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

src/remote.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ static int download_tags_value(git_remote *remote, git_config *cfg)
8282

8383
static int ensure_remote_name_is_valid(const char *name)
8484
{
85-
int error = 0;
85+
int valid, error;
86+
87+
error = git_remote_name_is_valid(&valid, name);
8688

87-
if (!git_remote_is_valid_name(name)) {
89+
if (!error && !valid) {
8890
git_error_set(
8991
GIT_ERROR_CONFIG,
9092
"'%s' is not a valid remote name.", name ? name : "(null)");

tests/network/remote/isvalidname.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
#include "clar_libgit2.h"
22

3+
static int is_valid_name(const char *name)
4+
{
5+
int valid = 0;
6+
cl_git_pass(git_remote_name_is_valid(&valid, name));
7+
return valid;
8+
}
9+
310
void test_network_remote_isvalidname__can_detect_invalid_formats(void)
411
{
5-
cl_assert_equal_i(false, git_remote_is_valid_name("/"));
6-
cl_assert_equal_i(false, git_remote_is_valid_name("//"));
7-
cl_assert_equal_i(false, git_remote_is_valid_name(".lock"));
8-
cl_assert_equal_i(false, git_remote_is_valid_name("a.lock"));
9-
cl_assert_equal_i(false, git_remote_is_valid_name("/no/leading/slash"));
10-
cl_assert_equal_i(false, git_remote_is_valid_name("no/trailing/slash/"));
12+
cl_assert_equal_i(false, is_valid_name("/"));
13+
cl_assert_equal_i(false, is_valid_name("//"));
14+
cl_assert_equal_i(false, is_valid_name(".lock"));
15+
cl_assert_equal_i(false, is_valid_name("a.lock"));
16+
cl_assert_equal_i(false, is_valid_name("/no/leading/slash"));
17+
cl_assert_equal_i(false, is_valid_name("no/trailing/slash/"));
1118
}
1219

1320
void test_network_remote_isvalidname__wont_hopefully_choke_on_valid_formats(void)
1421
{
15-
cl_assert_equal_i(true, git_remote_is_valid_name("webmatrix"));
16-
cl_assert_equal_i(true, git_remote_is_valid_name("yishaigalatzer/rules"));
22+
cl_assert_equal_i(true, is_valid_name("webmatrix"));
23+
cl_assert_equal_i(true, is_valid_name("yishaigalatzer/rules"));
1724
}

0 commit comments

Comments
 (0)