Merge branch 'ma/t7005-bash-workaround' into maint

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index ccceaf19a74373bb23b2a2b1aa71b7f0bb909d54..5c5afa2b985e2e524601518bbb8fb8d3c8efda61 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -372,6 +372,7 @@ while read commit parents; do
        git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
 
        report_progress
+       test -f "$workdir"/../map/$commit && continue
 
        case "$filter_subdir" in
        "")