FIX: make branch hunting backwards compatible

Previous to this change older versions of Discourse would fail here
2020-07-08 16:13:33 +10:00 · 2020-07-08 16:13:33 +10:00 · a9df2937c1
parent d4ea029609
commit a9df2937c1
1 changed files with 5 additions and 1 deletions
--- 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)