Merge branch 'jk/send-email-expand-paths'

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index b7bad160061177dac9230d6dcbb8dde3fcfb6aaa..cefd1452c66663fee9b00d1406b1d4f14e7964ac 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
-               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
@@ -347,7 +349,7 @@ while read commit parents; do
                        die "tree filter failed: $filter_tree"
 
                (
-                       git diff-index -r --name-only --ignore-submodules $commit &&
+                       git diff-index -r --name-only --ignore-submodules $commit -- &&
                        git ls-files --others
                ) > "$tempdir"/tree-state || exit
                git update-index --add --replace --remove --stdin \
@@ -375,7 +377,7 @@ while read commit parents; do
        fi
 
        {
-               while read -r header_line && test -n "$header_line"
+               while IFS='' read -r header_line && test -n "$header_line"
                do
                        # skip header lines...
                        :;