From 850be0655938fbf9a431eb23f18fd49b014233dc Mon Sep 17 00:00:00 2001
From: Will Walthall <ghthor@gmail.com>
Date: Sun, 12 Aug 2012 09:18:02 -0400
Subject: [PATCH] Convert `git_add_patch` into a simple command

---
 git.scmbrc.example              |  2 +-
 lib/git/aliases_and_bindings.sh |  2 +-
 lib/git/status_shortcuts.sh     | 30 ------------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index b73d932..cab1440 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -29,7 +29,7 @@ git_alias="g"
 # 1. 'SCM Breeze' functions
 git_status_shortcuts_alias="gs"
 git_add_shortcuts_alias="ga"
-git_add_patch_shortcuts_alias="gap"
+git_add_patch_alias="gap"
 git_show_files_alias="gsf"
 exec_git_expand_args_alias="ge"
 # 2. Commands that handle paths (with shortcut args expanded)
diff --git a/lib/git/aliases_and_bindings.sh b/lib/git/aliases_and_bindings.sh
index 8109cb4..aae8d7b 100644
--- a/lib/git/aliases_and_bindings.sh
+++ b/lib/git/aliases_and_bindings.sh
@@ -51,7 +51,6 @@ __git_alias () {
 # SCM Breeze functions
 _alias $git_status_shortcuts_alias="git_status_shortcuts"
 _alias $git_add_shortcuts_alias="git_add_shortcuts"
-_alias $git_add_patch_shortcuts_alias="git_add_patch_shortcuts"
 _alias $exec_git_expand_args_alias="exec_git_expand_args"
 _alias $git_show_files_alias="git_show_affected_files"
 _alias $git_commit_all_alias='git_commit_all'
@@ -67,6 +66,7 @@ __git_alias "$git_rm_alias"          "$_exp git" "rm"
 __git_alias "$git_blame_alias"       "$_exp git" "blame"
 __git_alias "$git_diff_alias"        "$_exp git" "diff"
 __git_alias "$git_diff_cached_alias" "$_exp git" "diff" "--cached"
+__git_alias "$git_add_patch_alias"   "$_exp git" "add" "-p"
 
 # Standard commands
 __git_alias "$git_clone_alias" "git" 'clone'
diff --git a/lib/git/status_shortcuts.sh b/lib/git/status_shortcuts.sh
index f2fbef2..d5c94dc 100644
--- a/lib/git/status_shortcuts.sh
+++ b/lib/git/status_shortcuts.sh
@@ -92,36 +92,6 @@ git_silent_add_shortcuts() {
   fi
 }
 
-# 'git add -p' wrapper
-# This shortcut means 'stage my selection of patchs for the file'
-# Should be used in conjunction with the git_status_shortcuts() function for 'git status'.
-# -------------------------------------------------------------------------------
-git_add_patch_shortcuts() {
-  if [ -z "$1" ]; then
-    echo "Usage: gap <file>  => git add -p <file>"
-    echo "       gap 1       => git add -p \$e1"
-    echo "       gap 2-4    => git add -p \$e2 \$e3 \$e4"
-    echo "       gap 2 5-7  => git add -p \$e2 \$e5 \$e6 \$e7"
-  else
-    git_silent_add_patch_shortcuts "$@"
-    # Makes sense to run 'git status' after this command.
-    git_status_shortcuts
-  fi
-}
-# Does nothing if no args are given.
-git_silent_add_patch_shortcuts() {
-  if [ -n "$1" ]; then
-    # Expand args and process resulting set of files.
-    IFS=$'\t'
-    for file in $(git_expand_args "$@"); do
-      git add -p "$file"
-      echo -e "# Added '$file'"
-    done
-    IFS=$' \t\n'
-    echo "#"
-  fi
-}
-
 # Prints a list of all files affected by a given SHA1,
 # and exports numbered environment variables for each file.
 git_show_affected_files(){