Skip to content

Commit d97afb9

Browse files
ethomsonethomson
authored
Merge pull request libgit2#5060 from pks-t/pks/refspec-nested-globs
Loosen restriction on wildcard "*" refspecs
2 parents 3d9e82f + 0c71e4c commit d97afb9

File tree

4 files changed

+49
-36
lines changed

4 files changed

+49
-36
lines changed

‎src/refs.c‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -897,14 +897,13 @@ static int is_valid_ref_char(char ch)
897897
case '\\':
898898
case '?':
899899
case '[':
900-
case '*':
901900
return 0;
902901
default:
903902
return 1;
904903
}
905904
}
906905

907-
static int ensure_segment_validity(const char *name)
906+
static int ensure_segment_validity(const char *name, char may_contain_glob)
908907
{
909908
const char *current = name;
910909
char prev = '\0';
@@ -927,6 +926,12 @@ static int ensure_segment_validity(const char *name)
927926
if (prev == '@' && *current == '{')
928927
return -1; /* Refname contains "@{" */
929928

929+
if (*current == '*') {
930+
if (!may_contain_glob)
931+
return -1;
932+
may_contain_glob = 0;
933+
}
934+
930935
prev = *current;
931936
}
932937

@@ -1005,19 +1010,20 @@ int git_reference__normalize_name(
10051010
}
10061011

10071012
while (true) {
1008-
segment_len = ensure_segment_validity(current);
1009-
if (segment_len < 0) {
1010-
if ((process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) &&
1011-
current[0] == '*' &&
1012-
(current[1] == '\0' || current[1] == '/')) {
1013-
/* Accept one wildcard as a full refname component. */
1014-
process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
1015-
segment_len = 1;
1016-
} else
1017-
goto cleanup;
1018-
}
1013+
char may_contain_glob = process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
1014+
1015+
segment_len = ensure_segment_validity(current, may_contain_glob);
1016+
if (segment_len < 0)
1017+
goto cleanup;
10191018

10201019
if (segment_len > 0) {
1020+
/*
1021+
* There may only be one glob in a pattern, thus we reset
1022+
* the pattern-flag in case the current segment has one.
1023+
*/
1024+
if (memchr(current, '*', segment_len))
1025+
process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
1026+
10211027
if (normalize) {
10221028
size_t cur_len = git_buf_len(buf);
10231029

‎src/refspec.c‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ static int refspec_transform(
228228
git_buf *out, const char *from, const char *to, const char *name)
229229
{
230230
const char *from_star, *to_star;
231-
const char *name_slash, *from_slash;
232231
size_t replacement_len, star_offset;
233232

234233
git_buf_sanitize(out);
@@ -251,17 +250,11 @@ static int refspec_transform(
251250
/* the first half is copied over */
252251
git_buf_put(out, to, to_star - to);
253252

254-
/* then we copy over the replacement, from the star's offset to the next slash in 'name' */
255-
name_slash = strchr(name + star_offset, '/');
256-
if (!name_slash)
257-
name_slash = strrchr(name, '\0');
258-
259-
/* if there is no slash after the star in 'from', we want to copy everything over */
260-
from_slash = strchr(from + star_offset, '/');
261-
if (!from_slash)
262-
name_slash = strrchr(name, '\0');
263-
264-
replacement_len = (name_slash - name) - star_offset;
253+
/*
254+
* Copy over the name, but exclude the trailing part in "from" starting
255+
* after the glob
256+
*/
257+
replacement_len = strlen(name + star_offset) - strlen(from_star + 1);
265258
git_buf_put(out, name + star_offset, replacement_len);
266259

267260
return git_buf_puts(out, to_star + 1);

‎tests/network/refspecs.c‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,18 @@ void test_network_refspecs__parsing(void)
7070
assert_refspec(GIT_DIRECTION_PUSH, ":refs/remotes/frotz/delete me", false);
7171
assert_refspec(GIT_DIRECTION_FETCH, ":refs/remotes/frotz/HEAD to me", false);
7272

73-
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false);
74-
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false);
73+
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", true);
74+
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", true);
7575

76-
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads*/for-linus:refs/remotes/mine/*", false);
77-
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads*/for-linus:refs/remotes/mine/*", false);
76+
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads*/for-linus:refs/remotes/mine/*", true);
77+
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads*/for-linus:refs/remotes/mine/*", true);
7878

7979
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false);
8080
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false);
8181

82+
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*g*/for-linus:refs/remotes/mine/*", false);
83+
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*g*/for-linus:refs/remotes/mine/*", false);
84+
8285
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*", true);
8386
assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*", true);
8487

@@ -93,7 +96,7 @@ static void assert_valid_transform(const char *refspec, const char *name, const
9396
git_refspec spec;
9497
git_buf buf = GIT_BUF_INIT;
9598

96-
git_refspec__parse(&spec, refspec, true);
99+
cl_git_pass(git_refspec__parse(&spec, refspec, true));
97100
cl_git_pass(git_refspec_transform(&buf, &spec, name));
98101
cl_assert_equal_s(result, buf.ptr);
99102

@@ -111,6 +114,17 @@ void test_network_refspecs__transform_mid_star(void)
111114
assert_valid_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master");
112115
}
113116

117+
void test_network_refspecs__transform_loosened_star(void)
118+
{
119+
assert_valid_transform("refs/heads/branch-*:refs/remotes/origin/branch-*", "refs/heads/branch-a", "refs/remotes/origin/branch-a");
120+
assert_valid_transform("refs/heads/branch-*/head:refs/remotes/origin/branch-*/head", "refs/heads/branch-a/head", "refs/remotes/origin/branch-a/head");
121+
}
122+
123+
void test_network_refspecs__transform_nested_star(void)
124+
{
125+
assert_valid_transform("refs/heads/x*x/for-linus:refs/remotes/mine/*", "refs/heads/xbranchx/for-linus", "refs/remotes/mine/branch");
126+
}
127+
114128
void test_network_refspecs__no_dst(void)
115129
{
116130
assert_valid_transform("refs/heads/master:", "refs/heads/master", "");

‎tests/refs/normalize.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,12 @@ void test_refs_normalize__buffer_has_to_be_big_enough_to_hold_the_normalized_ver
352352

353353
void test_refs_normalize__refspec_pattern(void)
354354
{
355-
ensure_refname_invalid(
356-
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar");
357-
ensure_refname_invalid(
358-
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar");
359-
ensure_refname_invalid(
360-
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar");
355+
ensure_refname_normalized(
356+
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar", "heads/*foo/bar");
357+
ensure_refname_normalized(
358+
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar", "heads/foo*/bar");
359+
ensure_refname_normalized(
360+
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar", "heads/f*o/bar");
361361

362362
ensure_refname_invalid(
363363
GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo");

0 commit comments

Comments
 (0)