← Back to team overview

launchpad-reviewers team mailing list archive

Re: [Merge] ~lool/git-build-recipe:fetch-pristine-tar-tags into git-build-recipe:master

 

To avoid conflicts between tags and branches, I recommend putting tags inside refs/tags/{remote}/* like this:

diff --git a/gitbuildrecipe/recipe.py b/gitbuildrecipe/recipe.py
index f932ca7..3b51d98 100644
--- a/gitbuildrecipe/recipe.py
+++ b/gitbuildrecipe/recipe.py
@@ -339,11 +339,10 @@ def fetch_branches(child_branch):
         logging.info(
             "Failed to fetch HEAD; recipe instructions for this repository "
             "that do not specify a branch name will fail.")
-    # Fetch all remote branches and (implicitly) any tags that reference
-    # commits in those refs. Tags that aren't on a branch won't be fetched.
     child_branch.git_call(
         "fetch", url,
-        "refs/heads/*:refs/remotes/%s/*" % child_branch.remote_name)
+        "refs/heads/*:refs/remotes/%s/*" % child_branch.remote_name,
+        "refs/tags/*:refs/tags/%s/*" % child_branch.remote_name)
 
 
 @lru_cache(maxsize=1)

-- 
https://code.launchpad.net/~lool/git-build-recipe/+git/git-build-recipe/+merge/443942
Your team Launchpad code reviewers is requested to review the proposed merge of ~lool/git-build-recipe:fetch-pristine-tar-tags into git-build-recipe:master.



References