Merge branch 'kb/tracking-count-no-merges'

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 20f6f5175070f62ab74eda4839c637afe1004d49..b90d3df3a7db97dbc8a16e9e73b705d52bf8fd20 100755 (executable)
--- 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
        "")