Change default branch behaviour for git repos #749

If git repository HEAD points to a branch, use that as the default branch. Otherwise fall back to previous method.

Change default branch behaviour for git repos #749
If git repository HEAD points to a branch, use that as the default branch. Otherwise fall back to previous method.
1722e96b · Justin Geibel · Felix Schäfer · 4956e9ca · 1722e96b · 1722e96b
Commit 1722e96b authored Dec 03, 2011 by Justin Geibel Committed by Felix Schäfer Jun 05, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

git_adapter.rb lib/redmine/scm/adapters/git_adapter.rb +7 -0

git_adapter_test.rb test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +7 -0

No files found.
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -100,6 +100,13 @@ module Redmine
        def default_branch
          bras = self.branches
          return nil if bras.nil?
+           head = nil
+           scm_cmd('symbolic-ref', 'HEAD') do |io|
+             head = io.readline
+           end
+           /^refs\/heads\/(.*)$/.match(head)
+           bras.include?($1) ? $1 : bras.first
+         rescue ScmCommandAborted, EOFError
          bras.include?('master') ? 'master' : bras.first
        end


--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -231,6 +231,13 @@ begin
        end
      end

+      def test_default_branch
+        @adapter.send :scm_cmd, 'branch', '-m', 'master', 'non-master-default-branch'
+        assert_equal 'non-master-default-branch', @adapter.default_branch
+      ensure
+        @adapter.send :scm_cmd, 'branch', '-m', 'non-master-default-branch', 'master'
+      end
+
      private

      def test_scm_version_for(scm_command_version, version)