remote-bzr: avoid bad refs

Versions of fast-export before v1.8.2 throws a bad 'reset' commands
because of a behavior in transport-helper that is not even needed.
We should ignore them, otherwise we will treat them as branches and
fail.

This was fixed in v1.8.2, but some people use this script in older
versions of git.

Also, check if the ref was a tag, and skip it for now.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib/remote-helpers/git-remote-bzr

@@ -682,23 +682,31 @@ def do_export(parser):
             die('unhandled export command: %s' % line)
 
     for ref, revid in parsed_refs.iteritems():
-        name = ref[len('refs/heads/'):]
+        if ref.startswith('refs/heads/'):
-        branch = bzrlib.branch.Branch.open(branches[name])
+            name = ref[len('refs/heads/'):]
-        branch.generate_revision_history(revid, marks.get_tip(name))
+            branch = bzrlib.branch.Branch.open(branches[name])
+            branch.generate_revision_history(revid, marks.get_tip(name))
 
-        if name in peers:
+            if name in peers:
-            peer = bzrlib.branch.Branch.open(peers[name])
+                peer = bzrlib.branch.Branch.open(peers[name])
-            try:
+                try:
-                peer.bzrdir.push_branch(branch, revision_id=revid)
+                    peer.bzrdir.push_branch(branch, revision_id=revid)
-            except bzrlib.errors.DivergedBranches:
+                except bzrlib.errors.DivergedBranches:
-                print "error %s non-fast forward" % ref
+                    print "error %s non-fast forward" % ref
-                continue
+                    continue
 
-        try:
+            try:
-            wt = branch.bzrdir.open_workingtree()
+                wt = branch.bzrdir.open_workingtree()
-            wt.update()
+                wt.update()
-        except bzrlib.errors.NoWorkingTree:
+            except bzrlib.errors.NoWorkingTree:
-            pass
+                pass
+        elif ref.startswith('refs/tags/'):
+            # TODO: implement tag push
+            print "error %s pushing tags not supported" % ref
+            continue
+        else:
+            # transport-helper/fast-export bugs
+            continue
 
         print "ok %s" % ref