Merge branch 'jc/diff-index-unpack' into maint

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 71d072baafa12e90d994e69c7ad03f1a245fecb6..804a7f4bc912ab0c9c51038456d9abe4216947a5 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -363,7 +363,7 @@ while read commit parents; do
        sed -e '1,/^$/d' <../commit | \
                eval "$filter_msg" > ../message ||
                        die "msg filter failed: $filter_msg"
-       @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
+       workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
                $(git write-tree) $parentstr < ../message > ../map/$commit ||
                        die "could not write rewritten commit"
 done <../revs