Permalink
Browse files

Don't die if HEAD ref is not symbolic.

Examples of situations when HEAD is not symbolic:

 * You're doing interactive rebase
 * You're using git bisect
 * ... and so on.
  • Loading branch information...
1 parent c3808d8 commit 549f113930b5332ce74cb0c2494394c743b41d07 @paxan paxan committed Mar 5, 2013
Showing with 5 additions and 2 deletions.
  1. +5 −2 script/boxen
View
@@ -39,9 +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'
- short_branch = current_branch.split('/')[2..-1].join('/')
-
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!"
elsif !fast_forwardable
warn "Boxen's master branch is out of sync, won't auto-update!"

0 comments on commit 549f113

Please sign in to comment.