From a9df2937c154475edd7733b0776f94eaf87fd788 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 8 Jul 2020 16:13:33 +1000 Subject: [PATCH] FIX: make branch hunting backwards compatible Previous to this change older versions of Discourse would fail here --- lib/docker_manager/git_repo.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/docker_manager/git_repo.rb b/lib/docker_manager/git_repo.rb index e425eba..5581158 100644 --- a/lib/docker_manager/git_repo.rb +++ b/lib/docker_manager/git_repo.rb @@ -113,7 +113,11 @@ class DockerManager::GitRepo end def tracking_branch - Discourse.find_compatible_git_resource(path) || run("for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD)") + branch = nil + if defined?(Discourse.find_compatible_git_resource) + branch = Discourse.find_compatible_git_resource(path) + end + branch || run("for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD)") end def run(cmd)