From 75e9a909a5d80aedbb2e3a8876e9fae34e468bdd Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Tue, 21 Aug 2012 14:02:00 +1200
Subject: [PATCH] Revert "Changed _alias to alias_no_errors"

This reverts commit dba367d7f17def0384f5c342fe9b97edbcc664a9.
---
 lib/git/aliases.sh          | 14 +++++++-------
 lib/git/branch_shortcuts.sh |  8 ++++----
 lib/scm_breeze.sh           |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 899150a..94ca98f 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -35,7 +35,7 @@ function git(){
   esac
 }
 
-alias_no_errors $git_alias='git'
+_alias $git_alias='git'
 
 
 # --------------------------------------------------------------------
@@ -73,14 +73,14 @@ __git_alias () {
 
 # --------------------------------------------------------------------
 # SCM Breeze functions
-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'
+_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'
 
 # Git Index alias
-alias_no_errors $git_index_alias="git_index"
+_alias $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 e3d93ea..7a52531 100644
--- a/lib/git/branch_shortcuts.sh
+++ b/lib/git/branch_shortcuts.sh
@@ -51,7 +51,7 @@ EOF
   done
 }
 
-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
+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"
diff --git a/lib/scm_breeze.sh b/lib/scm_breeze.sh
index 929007c..1b86a5e 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_no_errors(){ alias "$@" 2> /dev/null; }
+_alias(){ alias "$@" 2> /dev/null; }
 
 
 # Updates SCM Breeze from GitHub.