Jelajahi Sumber

Support detached HEAD in manifest repository

If the manifest repository is on a detached HEAD and we are parsing
an XML formatted manifest we should simply set the branch property
to None, rather than crash with an AttributeError.

Signed-off-by: Shawn O. Pearce <sop@google.com>
Shawn O. Pearce 16 tahun lalu
induk
melakukan
21c5c34ee2
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      manifest_xml.py

+ 1 - 1
manifest_xml.py

@@ -183,7 +183,7 @@ class XmlManifest(object):
     if not self._loaded:
       m = self.manifestProject
       b = m.GetBranch(m.CurrentBranch).merge
-      if b.startswith(R_HEADS):
+      if b is not None and b.startswith(R_HEADS):
         b = b[len(R_HEADS):]
       self.branch = b