diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh index 94ca98f..899150a 100644 --- a/lib/git/aliases.sh +++ b/lib/git/aliases.sh @@ -35,7 +35,7 @@ function git(){ esac } -_alias $git_alias='git' +alias_no_errors $git_alias='git' # -------------------------------------------------------------------- @@ -73,14 +73,14 @@ __git_alias () { # -------------------------------------------------------------------- # SCM Breeze functions -_alias $git_status_shortcuts_alias="git_status_shortcuts" -_alias $git_add_shortcuts_alias="git_add_shortcuts" -_alias $exec_scmb_expand_args_alias="exec_scmb_expand_args" -_alias $git_show_files_alias="git_show_affected_files" -_alias $git_commit_all_alias='git_commit_all' +alias_no_errors $git_status_shortcuts_alias="git_status_shortcuts" +alias_no_errors $git_add_shortcuts_alias="git_add_shortcuts" +alias_no_errors $exec_scmb_expand_args_alias="exec_scmb_expand_args" +alias_no_errors $git_show_files_alias="git_show_affected_files" +alias_no_errors $git_commit_all_alias='git_commit_all' # Git Index alias -_alias $git_index_alias="git_index" +alias_no_errors $git_index_alias="git_index" # Only set up the following aliases if 'git_setup_aliases' is 'yes' if [ "$git_setup_aliases" = "yes" ]; then diff --git a/lib/git/branch_shortcuts.sh b/lib/git/branch_shortcuts.sh index ba96187..2292997 100644 --- a/lib/git/branch_shortcuts.sh +++ b/lib/git/branch_shortcuts.sh @@ -38,7 +38,7 @@ EOF done } -alias "$git_branch_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts" -alias "$git_branch_all_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -a" -alias "$git_branch_move_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -m" -alias "$git_branch_delete_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -D" \ No newline at end of file +alias_no_errors "$git_branch_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts" +alias_no_errors "$git_branch_all_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -a" +alias_no_errors "$git_branch_move_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -m" +alias_no_errors "$git_branch_delete_alias"="exec_scmb_expand_args _scmb_git_branch_shortcuts -D" \ No newline at end of file diff --git a/lib/scm_breeze.sh b/lib/scm_breeze.sh index 1b86a5e..929007c 100644 --- a/lib/scm_breeze.sh +++ b/lib/scm_breeze.sh @@ -10,7 +10,7 @@ enable_nullglob() { if [ $shell = "zsh" ]; then setopt NULL_GLOB; else shopt disable_nullglob() { if [ $shell = "zsh" ]; then unsetopt NULL_GLOB; else shopt -u nullglob; fi; } # Alias wrapper that ignores errors if alias is not defined. -_alias(){ alias "$@" 2> /dev/null; } +alias_no_errors(){ alias "$@" 2> /dev/null; } # Updates SCM Breeze from GitHub.