diff --git a/git_cl.py b/git_cl.py
index cd724c93a..94fceed23 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1311,7 +1311,7 @@ class Changelist(object):
 
         self.branchref = branchref
         if self.branchref:
-            assert branchref.startswith('refs/heads/')
+            assert branchref.startswith(('refs/heads/', 'refs/branch-heads/'))
             self.branch = scm.GIT.ShortBranchName(self.branchref)
         else:
             self.branch = None