1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer the current branch or tag name

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-05-31 02:30:29 +09:00
parent fd658ec821
commit 1e9057b54a
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tool/vcs.rb
View File

@ -408,8 +408,21 @@ class VCS
branch = cmd_read_at(srcdir, [gitcmd + %W[symbolic-ref --short HEAD]]) branch = cmd_read_at(srcdir, [gitcmd + %W[symbolic-ref --short HEAD]])
if branch.empty? if branch.empty?
branch_list = cmd_read_at(srcdir, [gitcmd + %W[branch --list --contains HEAD]]).lines.to_a branch_list = cmd_read_at(srcdir, [gitcmd + %W[branch --list --contains HEAD]]).lines.to_a
branch_list.delete_if {|b| /detached at/ =~ b} branch, = branch_list.grep(/\A\*/)
(branch = branch_list[0]).strip! unless branch_list.empty? case branch
when /\A\* *\(\S+ detached at (.*)\)\Z/
branch = $1
branch = nil if last.start_with?(branch)
when /\A\* (\S+)\Z/
branch = $1
else
branch = nil
end
unless branch
branch_list.each {|b| b.strip!}
branch_list.delete_if {|b| / / =~ b}
branch = branch_list.min_by(&:length) || ""
end
end end
branch.chomp! branch.chomp!
branch = ":detached:" if branch.empty? branch = ":detached:" if branch.empty?