From: newren@gmail.com Date: Wed, 25 Mar 2009 21:51:01 GMT Subject: Re: [PATCH] git-filter-branch: avoid collisions with variables in eval'ed commands Message-ID: <1238017861-15292-1-git-send-email-newren@gmail.com> In-Reply-To: <51419b2c0903251433s75775206x556fc2d65a347d7d@mail.gmail.com> From: Elijah Newren Avoid using simple variable names like 'i', since user commands are eval'ed and may clash with and overwrite our values. Signed-off-by: Elijah Newren --- If you have a different preference for the variable name, I'd be happy to change it (again). All I care about is avoiding conflicts with what people might pass in their scripts. git-filter-branch.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 20f6f51..b90d3df 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -272,10 +272,10 @@ test $commits -eq 0 && die "Found nothing to rewrite" # Rewrite the commits -i=0 +git_filter_branch__commit_count=0 while read commit parents; do - i=$(($i+1)) - printf "\rRewrite $commit ($i/$commits)" + git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1)) + printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)" case "$filter_subdir" in "") -- 1.6.0.6