Created
June 17, 2012 20:31
-
-
Save tomku/2945671 to your computer and use it in GitHub Desktop.
Patch for oh-my-zsh to make sure to use real git instead of Ruby-powered hub alias
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/lib/git.zsh b/lib/git.zsh | |
| index fb4ad8c..66e4541 100644 | |
| --- a/lib/git.zsh | |
| +++ b/lib/git.zsh | |
| @@ -1,6 +1,6 @@ | |
| # get the name of the branch we are on | |
| function git_prompt_info() { | |
| - ref=$(git symbolic-ref HEAD 2> /dev/null) || return | |
| + ref=$(command git symbolic-ref HEAD 2> /dev/null) || return | |
| echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" | |
| } | |
| @@ -11,7 +11,7 @@ parse_git_dirty() { | |
| if [[ $POST_1_7_2_GIT -gt 0 ]]; then | |
| SUBMODULE_SYNTAX="--ignore-submodules=dirty" | |
| fi | |
| - if [[ -n $(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then | |
| + if [[ -n $(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then | |
| echo "$ZSH_THEME_GIT_PROMPT_DIRTY" | |
| else | |
| echo "$ZSH_THEME_GIT_PROMPT_CLEAN" | |
| @@ -21,24 +21,24 @@ parse_git_dirty() { | |
| # Checks if there are commits ahead from remote | |
| function git_prompt_ahead() { | |
| - if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then | |
| + if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then | |
| echo "$ZSH_THEME_GIT_PROMPT_AHEAD" | |
| fi | |
| } | |
| # Formats prompt string for current git commit short SHA | |
| function git_prompt_short_sha() { | |
| - SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" | |
| + SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" | |
| } | |
| # Formats prompt string for current git commit long SHA | |
| function git_prompt_long_sha() { | |
| - SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" | |
| + SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" | |
| } | |
| # Get the status of the working tree | |
| git_prompt_status() { | |
| - INDEX=$(git status --porcelain 2> /dev/null) | |
| + INDEX=$(command git status --porcelain 2> /dev/null) | |
| STATUS="" | |
| if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then | |
| STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" | |
| @@ -76,7 +76,7 @@ function git_compare_version() { | |
| local INPUT_GIT_VERSION=$1; | |
| local INSTALLED_GIT_VERSION | |
| INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION}); | |
| - INSTALLED_GIT_VERSION=($(git --version)); | |
| + INSTALLED_GIT_VERSION=($(command git --version)); | |
| INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]}); | |
| for i in {1..3}; do |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment