Skip to content

#531 add API to get default branch #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

#531 add API to get default branch #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f243744
#531 add API to get default branch
CAMOBAP Jul 15, 2021
26c5525
Merge branch 'master' into feature/default_branch
jcouball Apr 14, 2022
26eab87
Merge branch 'master' into feature/default_branch
jcouball Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/git.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,4 +308,12 @@ def self.ls_remote(location = nil, options = {})
def self.open(working_dir, options = {})
Base.open(working_dir, options)
end

# returns a String containing information about the default remote branch
# of the target repository
#
# @param [String|NilClass] location the target repository location or nil for '.'
def self.remote_default_branch(location = '.')
Base.open(location).remote.default_branch
end
end
14 changes: 14 additions & 0 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,20 @@ def branch_current
branches_all.select { |b| b[1] }.first[0] rescue nil
end

def branch_default
begin
full_name = command("symbolic-ref", "refs/remotes/origin/HEAD")
return full_name.gsub(%r{^refs/remotes/origin/}, "")
rescue Git::GitExecuteError
begin
full_name = command("symbolic-ref", "refs/origin/HEAD")
return full_name.gsub(%r{^refs/origin/}, "")
rescue Git::GitExecuteError
return command("symbolic-ref", "--short", "HEAD")
end
end
end

def branch_contains(commit, branch_name="")
command("branch", [branch_name, "--contains", commit])
end
Expand Down
5 changes: 5 additions & 0 deletions lib/git/remote.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ def branch(branch = 'master')
def remove
@base.lib.remote_remove(@name)
end

# @return [String] name of default branch
def default_branch
@base.lib.branch_default
end

def to_s
@name
Expand Down
3 changes: 3 additions & 0 deletions tests/units/test_git_path.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ def test_readables_in_temp_dir
end
end

def test_default_branch
assert_equal(@git.remote.default_branch, "git_grep")
end
end
5 changes: 5 additions & 0 deletions tests/units/test_lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,4 +295,9 @@ def test_show
assert(@lib.show('gitsearch1', 'scott/text.txt') == "hello\nthis is\na file\nthat is\nput here\nto search one\nto search two\nnothing!\n")
end

def test_branch_default
assert_equal(@lib.branch_default, "git_grep")
@lib.change_head_branch("master")
assert_equal(@lib.branch_default, "master")
end
end