lib/gitscape/base.rb in gitscape-1.5.2.1 vs lib/gitscape/base.rb in gitscape-1.5.3
- old
+ new
@@ -47,10 +47,10 @@
toRet = `git branch -a --merged origin/live`.split("\n").select{|b| /release\/i(\d+)$/.match b}.map{|b| b.scan(/release\/i(\d+)$/).flatten[0].to_i}.sort.last
toRet
end
def current_branch_name
- toRet = `git status --porcelain -b`.scan(/## (.*)/).flatten[0]
+ toRet = `git branch`.scan(/\* (.*)$/).flatten[0]
toRet
end
def current_release_branch_number
unmerged_into_live_branch_names = `git branch -a --no-merged live`.split("\n")