diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-28 19:38:13 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-28 19:38:13 +0000 |
| commit | 644d71bae111c7d2f3dc23cdccf68941d66505ff (patch) | |
| tree | c999485a5811df95c052d627c4a8d1aa65344dc6 /morphlib | |
| parent | 42cee6d2590959cc64edb3cd037a3cdd201c1974 (diff) | |
| parent | e5ae2aba5c0eed9562e34e9398af9989f9a12de7 (diff) | |
| download | morph-644d71bae111c7d2f3dc23cdccf68941d66505ff.tar.gz | |
Merge remote-tracking branch 'origin/pedroalvarez/S9240'
Reviewed-by: Lars Wirzenius
Reviewed-by: Dan Firth
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 5 |
1 files 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 |