flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use type -p / -P to determine git binary

Browse Source
This commit is contained in:
Nathan Broadbent
2012-11-13 12:45:01 +13:00
parent 7375597407
commit 992b1866b2
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/git/status_shortcuts.rb
View File

@@ -20,11 +20,11 @@
# # groups => 1: staged, 2: unmerged, 3: unstaged, 4: untracked # # 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] @branch = git_branch[/^\* (\(no branch\)|[^ ]*)/, 1]
@ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+)\]/, 1] @ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+)\]/, 1]
@@ -102,7 +102,7 @@ end
@git_status_long = `git status`.gsub(/\033\[[^m]*m/, "") # (strip colors) @git_status_long = `git status`.gsub(/\033\[[^m]*m/, "") # (strip colors)
end end
end end
msg, col, group = case change[0..1] msg, col, group = case change[0..1]
when "DD"; [" both deleted", :del, :unmerged] when "DD"; [" both deleted", :del, :unmerged]
@@ -156,7 +156,7 @@ def output_file_group(group)
# Find relative path, i.e. ../../lib/path/to/file # Find relative path, i.e. ../../lib/path/to/file
rel_file = relative_path(Dir.pwd, File.join(@project_root, h[: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 # If some submodules have changed, parse their summaries from long git status
sub_stat = nil sub_stat = nil
if @git_status_long && (sub_stat = @git_status_long[/#{h[:file]} \((.*)\)/, 1]) if @git_status_long && (sub_stat = @git_status_long[/#{h[:file]} \((.*)\)/, 1])

6
lib/scm_breeze.sh
View File

@@ -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 wrapper that ignores errors if alias is not defined.
_alias(){ alias "$@" 2> /dev/null; } _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. # Updates SCM Breeze from GitHub.
update_scm_breeze() { update_scm_breeze() {