Permalink
Browse files

Use type -p / -P to determine git binary

  • Loading branch information...
1 parent 7375597 commit 992b1866b272e03936761e4467f38cb3c79a1dcf @ndbroadbent ndbroadbent committed Nov 12, 2012
Showing with 10 additions and 6 deletions.
  1. +5 −5 lib/git/status_shortcuts.rb
  2. +5 −1 lib/scm_breeze.sh
@@ -20,11 +20,11 @@
# # groups => 1: staged, 2: unmerged, 3: unstaged, 4: untracked
# --------------------------------------------------------------------
-@project_root = File.exist?(".git") ? Dir.pwd : `git rev-parse --git-dir 2> /dev/null`.sub(/\/\.git$/, '').strip
+@project_root = File.exist?(".git") ? Dir.pwd : `\git rev-parse --git-dir 2> /dev/null`.sub(/\/\.git$/, '').strip
-@git_status = `git status --porcelain 2> /dev/null`
+@git_status = `\git status --porcelain 2> /dev/null`
-git_branch = `git branch -v 2> /dev/null`
+git_branch = `\git branch -v 2> /dev/null`
@branch = git_branch[/^\* (\(no branch\)|[^ ]*)/, 1]
@ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+)\]/, 1]
@@ -102,7 +102,7 @@ def has_modules?
@git_status_long = `git status`.gsub(/\033\[[^m]*m/, "") # (strip colors)
end
end
-
+
msg, col, group = case change[0..1]
when "DD"; [" both deleted", :del, :unmerged]
@@ -156,7 +156,7 @@ def output_file_group(group)
# Find relative path, i.e. ../../lib/path/to/file
rel_file = relative_path(Dir.pwd, File.join(@project_root, h[:file]))
-
+
# If some submodules have changed, parse their summaries from long git status
sub_stat = nil
if @git_status_long && (sub_stat = @git_status_long[/#{h[:file]} \((.*)\)/, 1])
View
@@ -12,7 +12,11 @@ disable_nullglob() { if [ $shell = "zsh" ]; then unsetopt NULL_GLOB; else shopt
# Alias wrapper that ignores errors if alias is not defined.
_alias(){ alias "$@" 2> /dev/null; }
-export GIT_BINARY=$(which git)
+if [ $shell = "zsh" ]; then
+ export GIT_BINARY=$(type -p git | sed 's/git is //')
+else
+ export GIT_BINARY=$(type -P git)
+fi
# Updates SCM Breeze from GitHub.
update_scm_breeze() {

0 comments on commit 992b186

Please sign in to comment.