mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filter-branch: make report-progress more readable

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2015-09-21 15:16:20 -07:00
parent 6a9d16a0a8
commit 71400d97b1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
git-filter-branch.sh
View File

@ -280,18 +280,20 @@ report_progress ()
if test -n "$progress" && if test -n "$progress" &&
test $git_filter_branch__commit_count -gt $next_sample_at test $git_filter_branch__commit_count -gt $next_sample_at
then then
now_timestamp=$(date +%s) count=$git_filter_branch__commit_count
elapsed_seconds=$(($now_timestamp - $start_timestamp))
remaining_second=$(( ($commits - $git_filter_branch__commit_count) * $elapsed_seconds / $git_filter_branch__commit_count )) now=$(date +%s)
if test $elapsed_seconds -gt 0 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 else
next_sample_at=$(($next_sample_at + 1)) next_sample_at=$(($next_sample_at + 1))
fi 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