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

Fixed completion appending '//' when in a project's directory

Browse Source
This commit is contained in:
Nathan Broadbent
2012-10-16 10:58:07 +13:00
parent 1d3651904b
commit 8f19f35b06
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/git/aliases.sh
View File

@@ -143,7 +143,7 @@ if [ $shell = "bash" ]; then
# Git repo management & aliases.
# If you know how to rewrite _git_index_tab_completion() for zsh, please send me a pull request!
complete -o nospace -o filenames -F _git_index_tab_completion git_index
complete -o nospace -o filenames -F _git_index_tab_completion $git_index_alias
complete -o nospace -F _git_index_tab_completion git_index
complete -o nospace -F _git_index_tab_completion $git_index_alias
fi

7
lib/git/repo_index.sh
View File

@@ -81,8 +81,9 @@ function git_index() {
# If $1 starts with '/', change to top-level directory within $GIT_REPO_DIR
elif ([ $shell = "bash" ] && [ "${1:0:1}" = "/" ]) || \
([ $shell = "zsh" ] && [ "${1[1]}" = "/" ]); then
if [ -d "$GIT_REPO_DIR$1" ]; then "cd" "$GIT_REPO_DIR$1"; fi
if [ -d "$GIT_REPO_DIR$1" ]; then
builtin cd "$GIT_REPO_DIR$1"
fi
else
_check_git_index
# Figure out which directory we need to change to.
@@ -107,7 +108,7 @@ function git_index() {
if [[ "$base_path" == "~"* ]]; then
base_path=$(eval echo ${base_path%%/*})/${base_path#*/}
fi
"cd" "$base_path"
builtin cd "$base_path"
# Run git callback (either update or show changes), if we are in the root directory
if [ -z "${sub_path%/}" ]; then _git_index_status_if_dirty; fi
else