mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mh/get-remote-group-fix' into maint
An off-by-one error made "git remote" to mishandle a remote with a single letter nickname. * mh/get-remote-group-fix: get_remote_group(): use skip_prefix() get_remote_group(): eliminate superfluous call to strcspn() get_remote_group(): rename local variable "space" to "wordlen" get_remote_group(): handle remotes with single-character names
This commit is contained in:
commit
03ea02771a
|
@ -979,17 +979,15 @@ static int get_remote_group(const char *key, const char *value, void *priv)
|
||||||
{
|
{
|
||||||
struct remote_group_data *g = priv;
|
struct remote_group_data *g = priv;
|
||||||
|
|
||||||
if (starts_with(key, "remotes.") &&
|
if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
|
||||||
!strcmp(key + 8, g->name)) {
|
|
||||||
/* split list by white space */
|
/* split list by white space */
|
||||||
int space = strcspn(value, " \t\n");
|
|
||||||
while (*value) {
|
while (*value) {
|
||||||
if (space > 1) {
|
size_t wordlen = strcspn(value, " \t\n");
|
||||||
|
|
||||||
|
if (wordlen >= 1)
|
||||||
string_list_append(g->list,
|
string_list_append(g->list,
|
||||||
xstrndup(value, space));
|
xstrndup(value, wordlen));
|
||||||
}
|
value += wordlen + (value[wordlen] != '\0');
|
||||||
value += space + (value[space] != '\0');
|
|
||||||
space = strcspn(value, " \t\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue