proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-19 19:55:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remote: don't confuse tag auto-follow rules with refspec matching

Browse Source 
When we're looking to update a tag, we can't stop if the tag auto-follow
rules don't say to update it. The tag might still match the refspec we
were given.
This commit is contained in:
Carlos Martín Nieto 2015-08-11 22:51:53 +02:00
parent a879276783
commit e3e017d483
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remote.c
View File

@ -1334,11 +1334,13 @@ static int update_tips_for_spec(
for (; i < refs->length; ++i) {
head = git_vector_get(refs, i);
autotag = 0;
git_buf_clear(&refname);
/* Ignore malformed ref names (which also saves us from tag^{} */
if (!git_reference_is_valid_name(head->name))
continue;
/* If we have a tag, see if the auto-follow rules say to update it */
if (git_refspec_src_matches(&tagspec, head->name)) {
if (tagopt != GIT_REMOTE_DOWNLOAD_TAGS_NONE) {
@ -1348,10 +1350,11 @@ static int update_tips_for_spec(
git_buf_clear(&refname);
if (git_buf_puts(&refname, head->name) < 0)
goto on_error;
} else {
continue;
}
} else if (git_refspec_src_matches(spec, head->name)) {
}
/* If we didn't want to auto-follow the tag, check if the refspec matches */
if (!autotag && git_refspec_src_matches(spec, head->name)) {
if (spec->dst) {
if (git_refspec_transform(&refname, spec, head->name) < 0)
goto on_error;
@ -1365,7 +1368,10 @@ static int update_tips_for_spec(
continue;
}
} else {
}
/* If we still don't have a refname, we don't want it */
if (git_buf_len(&refname) == 0) {
continue;
}