Merge lp:~jelmer/brz-git/fix-git-import into lp:brz-git

[Jelmer Vernooij]

Fix git-import command.

Fix git-import command.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-git-dev/27/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-git-dev/32/

[lp:~jelmer/brz-git/fix-git-import]

1820. By Jelmer Vernooij on 2018-03-06

Merge trunk.

=== modified file 'commands.py'
--- commands.py	2018-02-27 18:43:26 +0000
+++ commands.py	2018-03-06 11:56:28 +0000
@@ -22,6 +22,7 @@
 
 from __future__ import absolute_import
 
+import breezy.bzr.bzrdir
 from ...commands import (
     Command,
     display_command,
@@ -95,6 +96,7 @@
         from .repository import GitRepository
 
         dest_format = controldir.ControlDirFormat.get_default_format()
+        assert dest_format is not None
 
         if dest_location is None:
             dest_location = os.path.basename(src_location.rstrip("/\\"))
@@ -139,7 +141,6 @@
                 revid = mapping.revision_id_foreign_to_bzr(sha)
                 source_branch = LocalGitBranch(source_repo.controldir, source_repo,
                     sha)
-                source_branch.head = sha
                 if head_branch.last_revision() != revid:
                     head_branch.generate_revision_history(revid)
                 source_branch.tags.merge_to(head_branch.tags)