From 52e27d9b00fd18cde2ec27dbfda94eba3b0571bd Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Tue, 15 Oct 2013 10:55:14 +0000 Subject: Building with references to tags will now instead use the underlying commit --- 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 9961fcf3..260c0e48 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 -- cgit v1.2.1