filter-branch: make report-progress more readable

The name of some variables that are used very locally in this
function were overly long; they were making the lines harder to read
and the longer names didn't add much more information.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index b7bad160061177dac9230d6dcbb8dde3fcfb6aaa..5777947a5d6c0fadc2e91a809b4ce850cb152b24 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -280,18 +280,20 @@ report_progress ()
        if test -n "$progress" &&
                test $git_filter_branch__commit_count -gt $next_sample_at
        then
        if test -n "$progress" &&
                test $git_filter_branch__commit_count -gt $next_sample_at
        then

-               now_timestamp=$(date +%s)
-               elapsed_seconds=$(($now_timestamp - $start_timestamp))
-               remaining_second=$(( ($commits - $git_filter_branch__commit_count) * $elapsed_seconds / $git_filter_branch__commit_count ))
-               if test $elapsed_seconds -gt 0
+               count=$git_filter_branch__commit_count
+
+               now=$(date +%s)
+               elapsed=$(($now - $start_timestamp))
+               remaining=$(( ($commits - $count) * $elapsed / $count ))
+               if test $elapsed -gt 0

                then
                then

-                       next_sample_at=$(( ($elapsed_seconds + 1) * $git_filter_branch__commit_count / $elapsed_seconds ))
+                       next_sample_at=$(( ($elapsed + 1) * $count / $elapsed ))

                else
                        next_sample_at=$(($next_sample_at + 1))
                fi
                else
                        next_sample_at=$(($next_sample_at + 1))
                fi

-               progress=" ($elapsed_seconds seconds passed, remaining $remaining_second predicted)"
+               progress=" ($elapsed seconds passed, remaining $remaining predicted)"

        fi
        fi

-       printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress    "
+       printf "\rRewrite $commit ($count/$commits)$progress    "

 }
 
 git_filter_branch__commit_count=0
 }
 
 git_filter_branch__commit_count=0