From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Sep 2015 22:16:20 +0000 (-0700)
Subject: filter-branch: make report-progress more readable
X-Git-Tag: v2.7.0-rc0~125^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71400d97b12abeba25f2e8245a9751daf8583142;p=thirdparty%2Fgit.git

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 b7bad16006..5777947a5d 100755
--- 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
-		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
-			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
-		progress=" ($elapsed_seconds seconds passed, remaining $remaining_second predicted)"
+		progress=" ($elapsed seconds passed, remaining $remaining predicted)"
 	fi
-	printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress    "
+	printf "\rRewrite $commit ($count/$commits)$progress    "
 }
 
 git_filter_branch__commit_count=0