From 077f22da0b70ad26b25be2e312aa17dffbbf6d9c Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jon.delStrother@audioboo.fm>
Date: Tue, 28 Feb 2012 12:42:38 +0000
Subject: [PATCH] Don't export 'i' and 'cmd_output' as global vars

---
 lib/git/fallback/status_shortcuts_shell.sh | 1 +
 lib/git/status_shortcuts.sh                | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/git/fallback/status_shortcuts_shell.sh b/lib/git/fallback/status_shortcuts_shell.sh
index 3ce92a5..2e4025a 100644
--- a/lib/git/fallback/status_shortcuts_shell.sh
+++ b/lib/git/fallback/status_shortcuts_shell.sh
@@ -18,6 +18,7 @@ git_status_shortcuts() {
   zsh_compat # Ensure shwordsplit is on for zsh
   IFS=$'\n'
   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
     unset stat_file; unset stat_col; unset stat_msg; unset stat_grp; unset stat_x; unset stat_y
diff --git a/lib/git/status_shortcuts.sh b/lib/git/status_shortcuts.sh
index 3d64eda..1081fa6 100644
--- a/lib/git/status_shortcuts.sh
+++ b/lib/git/status_shortcuts.sh
@@ -20,7 +20,7 @@ git_status_shortcuts() {
   zsh_compat # Ensure shwordsplit is on for zsh
   git_clear_vars
   # 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"
   if [ "$scmbDebug" = "true" ]; then
     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
 git_clear_vars() {
+  local i
   for (( i=1; i<=$gs_max_changes; i++ )); do
     # Stop clearing after first empty var
     if [[ -z "$(eval echo "\$$git_env_char$i")" ]]; then break; fi