mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/get-remote-group-fix' into maint

Browse Source 
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:
Junio C Hamano
2015-09-03 19:17:47 -07:00
parent c415fb791b bc598c32ae
commit 03ea02771a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/fetch.c
View File

@ -979,17 +979,15 @@ static int get_remote_group(const char *key, const char *value, void *priv)
{
struct remote_group_data *g = priv;
if (starts_with(key, "remotes.") &&
!strcmp(key + 8, g->name)) {
if (skip_prefix(key, "remotes.", &key) && !strcmp(key, g->name)) {
/* split list by white space */
int space = strcspn(value, " \t\n");
while (*value) {
if (space > 1) {
size_t wordlen = strcspn(value, " \t\n");
if (wordlen >= 1)
string_list_append(g->list,
xstrndup(value, space));
}
value += space + (value[space] != '\0');
space = strcspn(value, " \t\n");
xstrndup(value, wordlen));
value += wordlen + (value[wordlen] != '\0');
}
}