atomaka/my-boxen
1
0
Fork 0
Code Releases Activity

It's cleaner to have another case: "not on any branch".

Browse source
This commit is contained in:
Pavel Repin 2013-03-05 13:57:03 -08:00
parent 549f113930
commit 9c3b169156
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
script/boxen
View file

@ -39,13 +39,12 @@ unless ENV["BOXEN_NO_PULL"] || ARGV.include?("--no-pull")
upstream_changes = `git rev-list --count master..origin/master`.chomp != '0'
fast_forwardable = `git rev-list --count origin/master..master`.chomp == '0'
if !master
short_branch = if current_branch.empty?
`git log -1 --pretty=format:%h`
else
current_branch.split('/')[2..-1].join('/')
end
warn "Boxen on a non-master branch '#{short_branch}', won't auto-update!"
if current_branch.empty?
ref = `git log -1 --pretty=format:%h`
warn "Boxen not currently on any branch (ref: #{ref}), won't auto-update!"
elsif !master
local_branch = current_branch.split('/')[2..-1].join('/')
warn "Boxen on a non-master branch '#{local_branch}', won't auto-update!"
elsif !fast_forwardable
warn "Boxen's master branch is out of sync, won't auto-update!"
elsif !clean