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

Don't export 'i' and 'cmd_output' as global vars

Browse Source
This commit is contained in:
Jonathan del Strother
2012-02-28 12:42:38 +00:00
parent c68f0c523a
commit 077f22da0b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/git/fallback/status_shortcuts_shell.sh
View File

@@ -18,6 +18,7 @@ git_status_shortcuts() {
zsh_compat # Ensure shwordsplit is on for zsh zsh_compat # Ensure shwordsplit is on for zsh
IFS=$'\n' IFS=$'\n'
local git_status="$(git status --porcelain 2> /dev/null)" local git_status="$(git status --porcelain 2> /dev/null)"
local i
if [ -n "$git_status" ] && [[ $(echo "$git_status" | wc -l) -le $gs_max_changes ]]; then if [ -n "$git_status" ] && [[ $(echo "$git_status" | wc -l) -le $gs_max_changes ]]; then
unset stat_file; unset stat_col; unset stat_msg; unset stat_grp; unset stat_x; unset stat_y unset stat_file; unset stat_col; unset stat_msg; unset stat_grp; unset stat_x; unset stat_y

3
lib/git/status_shortcuts.sh
View File

@@ -20,7 +20,7 @@ git_status_shortcuts() {
zsh_compat # Ensure shwordsplit is on for zsh zsh_compat # Ensure shwordsplit is on for zsh
git_clear_vars git_clear_vars
# Run ruby script, store output # Run ruby script, store output
cmd_output=$(/usr/bin/env ruby "$scmbDir/lib/git/status_shortcuts.rb" $@) local cmd_output=$(/usr/bin/env ruby "$scmbDir/lib/git/status_shortcuts.rb" $@)
# Print debug information if $scmbDebug = "true" # Print debug information if $scmbDebug = "true"
if [ "$scmbDebug" = "true" ]; then if [ "$scmbDebug" = "true" ]; then
printf "status_shortcuts.rb output => \n$cmd_output\n------------------------\n" printf "status_shortcuts.rb output => \n$cmd_output\n------------------------\n"
@@ -161,6 +161,7 @@ exec_git_expand_args() { $(git_expand_args "$@"); }
# Clear numbered env variables # Clear numbered env variables
git_clear_vars() { git_clear_vars() {
local i
for (( i=1; i<=$gs_max_changes; i++ )); do for (( i=1; i<=$gs_max_changes; i++ )); do
# Stop clearing after first empty var # Stop clearing after first empty var
if [[ -z "$(eval echo "\$$git_env_char$i")" ]]; then break; fi if [[ -z "$(eval echo "\$$git_env_char$i")" ]]; then break; fi