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

Merge pull request #43 from ghthor/master

Browse Source 
Simplified git add -p alias
This commit is contained in:
Nathan Broadbent
2012-08-12 06:34:45 -07:00
parent 98dc23a529 850be06559
commit 79a1132730
3 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git.scmbrc.example
View File

@@ -29,7 +29,7 @@ git_alias="g"
# 1. 'SCM Breeze' functions # 1. 'SCM Breeze' functions
git_status_shortcuts_alias="gs" git_status_shortcuts_alias="gs"
git_add_shortcuts_alias="ga" git_add_shortcuts_alias="ga"
git_add_patch_shortcuts_alias="gap" git_add_patch_alias="gap"
git_show_files_alias="gsf" git_show_files_alias="gsf"
exec_git_expand_args_alias="ge" exec_git_expand_args_alias="ge"
# 2. Commands that handle paths (with shortcut args expanded) # 2. Commands that handle paths (with shortcut args expanded)

2
lib/git/aliases_and_bindings.sh
View File

@@ -51,7 +51,6 @@ __git_alias () {
# SCM Breeze functions # SCM Breeze functions
_alias $git_status_shortcuts_alias="git_status_shortcuts" _alias $git_status_shortcuts_alias="git_status_shortcuts"
_alias $git_add_shortcuts_alias="git_add_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 $exec_git_expand_args_alias="exec_git_expand_args"
_alias $git_show_files_alias="git_show_affected_files" _alias $git_show_files_alias="git_show_affected_files"
_alias $git_commit_all_alias='git_commit_all' _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_blame_alias" "$_exp git" "blame"
__git_alias "$git_diff_alias" "$_exp git" "diff" __git_alias "$git_diff_alias" "$_exp git" "diff"
__git_alias "$git_diff_cached_alias" "$_exp git" "diff" "--cached" __git_alias "$git_diff_cached_alias" "$_exp git" "diff" "--cached"
__git_alias "$git_add_patch_alias" "$_exp git" "add" "-p"
# Standard commands # Standard commands
__git_alias "$git_clone_alias" "git" 'clone' __git_alias "$git_clone_alias" "git" 'clone'

30
lib/git/status_shortcuts.sh
View File

@@ -94,36 +94,6 @@ git_silent_add_shortcuts() {
fi 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, # Prints a list of all files affected by a given SHA1,
# and exports numbered environment variables for each file. # and exports numbered environment variables for each file.
git_show_affected_files(){ git_show_affected_files(){