Commit 1573acbbd9023b5c447caa7489f9579d8ffc810e
2015-08-12T08:46:50
Merge pull request #3372 from libgit2/cmn/mirror-refspec remote: don't confuse tag auto-follow rules with refspec matching
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/src/remote.c b/src/remote.c
index d31e1b8..7404bf4 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -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;
}
diff --git a/tests/network/fetchlocal.c b/tests/network/fetchlocal.c
index 06ee3dd..17c8f26 100644
--- a/tests/network/fetchlocal.c
+++ b/tests/network/fetchlocal.c
@@ -369,17 +369,46 @@ void test_network_fetchlocal__clone_into_mirror(void)
{
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
git_repository *repo;
- git_reference *head;
+ git_reference *ref;
opts.bare = true;
opts.remote_cb = remote_mirror_cb;
cl_git_pass(git_clone(&repo, cl_git_fixture_url("testrepo.git"), "./foo.git", &opts));
- cl_git_pass(git_reference_lookup(&head, repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
- cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head));
+ cl_git_pass(git_reference_lookup(&ref, repo, "HEAD"));
+ cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(ref));
+ cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(ref));
+
+ git_reference_free(ref);
+ cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master"));
+
+ git_reference_free(ref);
+ git_repository_free(repo);
+ cl_fixture_cleanup("./foo.git");
+}
- git_reference_free(head);
+void test_network_fetchlocal__all_refs(void)
+{
+ git_repository *repo;
+ git_remote *remote;
+ git_reference *ref;
+ char *allrefs = "+refs/*:refs/*";
+ git_strarray refspecs = {
+ &allrefs,
+ 1,
+ };
+
+ cl_git_pass(git_repository_init(&repo, "./foo.git", true));
+ cl_git_pass(git_remote_create_anonymous(&remote, repo, cl_git_fixture_url("testrepo.git")));
+ cl_git_pass(git_remote_fetch(remote, &refspecs, NULL, NULL));
+
+ cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master"));
+ git_reference_free(ref);
+
+ cl_git_pass(git_reference_lookup(&ref, repo, "refs/tags/test"));
+ git_reference_free(ref);
+
+ git_remote_free(remote);
git_repository_free(repo);
cl_fixture_cleanup("./foo.git");
}