adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the unnecessary action local variable

Browse Source
This commit is contained in:
Sorin Ionescu 2012-08-27 20:40:15 -04:00
parent 722353130e
commit 8d7f785ea9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/git/functions/git-info
View File

@ -70,7 +70,6 @@ omodload 'trap'
# Gets the Git special action (am, bisect, cherry, merge, rebase). # Gets the Git special action (am, bisect, cherry, merge, rebase).
# Borrowed from vcs_info and edited. # Borrowed from vcs_info and edited.
function _git-action { function _git-action {
local action=''
local action_dir local action_dir
local git_dir="$(git-dir)" local git_dir="$(git-dir)"
@ -80,13 +79,12 @@ function _git-action {
"${git_dir}/../.dotest"; do "${git_dir}/../.dotest"; do
if [[ -d "$action_dir" ]] ; then if [[ -d "$action_dir" ]] ; then
if [[ -f "${action_dir}/rebasing" ]] ; then if [[ -f "${action_dir}/rebasing" ]] ; then
action='rebase' print 'rebase'
elif [[ -f "${action_dir}/applying" ]] ; then elif [[ -f "${action_dir}/applying" ]] ; then
action='am' print 'am'
else else
action='am/rebase' print 'am/rebase'
fi fi
print "$action"
return 0 return 0
fi fi
done done