Skip to content

Commit 0a99ffb

Browse files
committed
Merge branch 'ms/remote-valid-remote-name'
Code shuffling. * ms/remote-valid-remote-name: remote: relocate valid_remote_name
2 parents 998c5f0 + f21ea69 commit 0a99ffb

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

refspec.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,16 +238,6 @@ int valid_fetch_refspec(const char *fetch_refspec_str)
238238
return ret;
239239
}
240240

241-
int valid_remote_name(const char *name)
242-
{
243-
int result;
244-
struct strbuf refspec = STRBUF_INIT;
245-
strbuf_addf(&refspec, "refs/heads/test:refs/remotes/%s/test", name);
246-
result = valid_fetch_refspec(refspec.buf);
247-
strbuf_release(&refspec);
248-
return result;
249-
}
250-
251241
void refspec_ref_prefixes(const struct refspec *rs,
252242
struct strvec *ref_prefixes)
253243
{

refspec.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ void refspec_appendn(struct refspec *rs, const char **refspecs, int nr);
6363
void refspec_clear(struct refspec *rs);
6464

6565
int valid_fetch_refspec(const char *refspec);
66-
int valid_remote_name(const char *name);
6766

6867
struct strvec;
6968
/*

remote.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,3 +2828,13 @@ char *relative_url(const char *remote_url, const char *url,
28282828
free(out);
28292829
return strbuf_detach(&sb, NULL);
28302830
}
2831+
2832+
int valid_remote_name(const char *name)
2833+
{
2834+
int result;
2835+
struct strbuf refspec = STRBUF_INIT;
2836+
strbuf_addf(&refspec, "refs/heads/test:refs/remotes/%s/test", name);
2837+
result = valid_fetch_refspec(refspec.buf);
2838+
strbuf_release(&refspec);
2839+
return result;
2840+
}

remote.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,4 +448,6 @@ void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *);
448448
char *relative_url(const char *remote_url, const char *url,
449449
const char *up_path);
450450

451+
int valid_remote_name(const char *name);
452+
451453
#endif

0 commit comments

Comments
 (0)