summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-02-25 16:53:35 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-03-26 20:50:50 +0000
commit8f72c7397f9b62046291d1d699f04ae0233e1afe (patch)
tree3f1fe928fb22732138c4907f2f24f9397843b267
parentea5a6365888118075216b164a1498b3c4ebe88f5 (diff)
downloadmorph-8f72c7397f9b62046291d1d699f04ae0233e1afe.tar.gz
Fix push_build_branches
A semantic error in the BuildBranch class meant that it was not possible to push temporary branches. This escaped testing since BuildBranch interacts too tightly with other components to be easily unit-tested, so testing was deferred to a yarn test. However, coverage isn't measured in yarn tests, so this code path was forgotten.
-rw-r--r--morphlib/buildbranch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index 546a29d5..d415e7e1 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -217,7 +217,7 @@ class BuildBranch(object):
# current HEAD
if self._push_temporary:
with morphlib.branchmanager.RemoteRefManager(False) as rrm:
- for gd, build_ref in self._to_push.iterkeys():
+ for gd, (build_ref, index) in self._to_push.iteritems():
remote = gd.get_remote('origin')
yield gd, build_ref, remote
refspec = morphlib.gitdir.RefSpec(build_ref)