GitImportProcessor: handle markers for merges

pmrowla · Jul 19, 2017 · f66e753 · f66e753
1 parent 33f5309
commit f66e753
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/dulwich/fastexport.py b/dulwich/fastexport.py
@@ -200,7 +200,10 @@ def commit_handler(self, cmd):
                 self._contents.items()))
         if self.last_commit is not None:
             commit.parents.append(self.last_commit)
-        commit.parents += cmd.merges
+        for merge in cmd.merges:
+            if merge.startswith(b':'):
+                merge = self.markers[merge[1:]]
+            commit.parents.append(merge)
         self.repo.object_store.add_object(commit)
         self.repo[cmd.ref] = commit.id
         self.last_commit = commit.id