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

Fixed bug in __git_alias

Browse Source
This commit is contained in:
Nathan Broadbent
2015-05-25 23:01:14 +07:00
parent 737a5d795b
commit d288f3cd74
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/git/aliases.sh
View File

@@ -65,7 +65,7 @@ _git
__git_alias () { __git_alias () {
if [ -n "$1" ]; then if [ -n "$1" ]; then
local alias_str cmd_prefix cmd cmd_args local alias_str cmd_prefix cmd cmd_args
alias_str="$1"; cmd_prefix="$2"; cmd="$3"; cmd_args=("${@:3}") alias_str="$1"; cmd_prefix="$2"; cmd="$3"; cmd_args=("${@:4}")
alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }${cmd_args[*]}" alias $alias_str="$cmd_prefix $cmd${cmd_args:+ }${cmd_args[*]}"
if [ "$shell" = "bash" ]; then if [ "$shell" = "bash" ]; then
__define_git_completion "$alias_str" "$cmd" __define_git_completion "$alias_str" "$cmd"

2
lib/git/shell_shortcuts.sh
View File

@@ -108,7 +108,7 @@ fi
# Function wrapper around 'll' # Function wrapper around 'll'
# Adds numbered shortcuts to output of ls -l, just like 'git status' # Adds numbered shortcuts to output of ls -l, just like 'git status'
if [ "$shell_ls_aliases_enabled" = "true" ]; then if [ "$shell_ls_aliases_enabled" = "true" ] && which ruby > /dev/null 2>&1; then
unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1 unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
function ls_with_file_shortcuts { function ls_with_file_shortcuts {
local ll_output local ll_output