Bazaar Git Plugin

Git annotated tags incorrectly imported into Bazaar

Bug #1025995 reported by Max Bowsher
16
This bug affects 4 people
Affects Status Importance Assigned to Milestone
Bazaar Git Plugin
Triaged
Medium
Unassigned
Breezy
Fix Released
Medium
Jelmer Vernooij
Breezy 3.0.0 "Pelican"

Bug Description

bzr-git 0.6.9 imports annotated git tags with the erroneous assumption that the tag sha1 points to a git commit object; it points to a tag object.

bzr-git should dereference the tag to its commit for import, and understand that this doesn't constitute a diverged ref that needs to be pushed back.

Related branches

lp://staging/~jelmer/brz-git/fix-fetch-peeled
Jelmer Vernooij: Approve
Diff: 426 lines (+155/-61)
4 files modified
branch.py (+1/-5)
fetch.py (+29/-34)
remote.py (+45/-15)
tests/test_remote.py (+80/-7)
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I can't reproduce this with bzr-git trunk. Can you provide a recipe that reproduces it for you?

Changed in bzr-git:
status: New → Incomplete
Revision history for this message
Max Bowsher (maxb) wrote :

Sure, here:

maxb@chimaera:/tmp/debmirror$ bzr branch git://git.debian.org/git/collab-maint/debmirror.git debmirror-bzr
Branched 301 revisions.
maxb@chimaera:/tmp/debmirror$ git clone git://git.debian.org/git/collab-maint/debmirror.git debmirror-git
Cloning into 'debmirror-git'...
remote: Counting objects: 1581, done.
remote: Compressing objects: 100% (434/434), done.
remote: Total 1581 (delta 1096), reused 1546 (delta 1078)
Receiving objects: 100% (1581/1581), 330.27 KiB, done.
Resolving deltas: 100% (1096/1096), done.
maxb@chimaera:/tmp/debmirror$ bzr tags --show-ids -d debmirror-bzr/ | grep 2.14
2.14 git-v1:24b17dd0545229d39780ab4a023f23fa0efc8730
maxb@chimaera:/tmp/debmirror$ GIT_DIR=debmirror-git/.git git show 2.14 | grep commit
commit 9b725953b530423dc210d970c386a3c2f14f8787

bzr 2.5.1 (ubuntu precise package); lp:bzr-git, lp:dulwich

Jelmer Vernooij (jelmer)
Changed in bzr-git:
status: Incomplete → Triaged
importance: Undecided → Medium
Revision history for this message
Felix Ruess (flixr) wrote :

Any updates on this?
I have the same problem (e.g. when using automatic launchpad import of a git repo https://code.launchpad.net/~morse-simulator/morse-simulator/master)

Lightweight tags work fine, but annotated or signed tags which create a tag object don't.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

There are no active maintainers for bzr-git; I'm happy to review patches, but no longer work on bzr-git myself.

Jelmer Vernooij (jelmer)
Changed in brz-git:
status: New → Triaged
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in brz-git:
status: Triaged → Fix Released
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in brz-git:
milestone: none → integration
Jelmer Vernooij (jelmer)
affects: brz-git → brz
Changed in brz:
milestone: integration → none
milestone: none → 3.0.0
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.