diff options
Diffstat (limited to 'morphlib/plugins/branch_and_merge_new_plugin.py')
-rw-r--r-- | morphlib/plugins/branch_and_merge_new_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 09dd5bd8..e7b5abc1 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -305,9 +305,9 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): def _load_morphology_from_git(self, loader, gd, ref, filename): try: - text = gd.cat_file('blob', ref, filename) + text = gd.get_file_from_ref(ref, filename) except cliapp.AppException: - text = gd.cat_file('blob', 'origin/%s' % ref, filename) + text = gd.get_file_from_ref('origin/%s' % ref, filename) return loader.load_from_string(text, filename) def _load_stratum_morphologies(self, loader, sb, system_morph): |