[PATCH 1/2] Building with references to tags will now instead use the underlying commit

Pedro Alvarez pedro.alvarez at codethink.co.uk
Fri Oct 25 11:09:43 BST 2013


From: Daniel Firth <dan.firth at codethink.co.uk>

---
 morphlib/plugins/branch_and_merge_plugin.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 990fe10..a91a0f0 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -1718,8 +1718,9 @@ class BranchAndMergePlugin(cliapp.Plugin):
             # Obtain parent SHA1 for the temporary ref tree to be committed.
             # This will either be the current commit of the temporary ref or
             # HEAD in case the temporary ref does not exist yet.
-            system_branch_sha1 = self.resolve_ref(repo_dir, system_branch)
-            parent_sha1 = self.resolve_ref(repo_dir, build_ref)
+            system_branch_sha1 = self.resolve_ref(
+                repo_dir, '%s^{commit}' % system_branch)
+            parent_sha1 = self.resolve_ref(repo_dir, '%s^{commit}' % build_ref)
             if not parent_sha1:
                 parent_sha1 = system_branch_sha1
 
-- 
1.7.10.4




More information about the baserock-dev mailing list