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

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 5777947a5d6c0fadc2e91a809b4ce850cb152b24..cefd1452c66663fee9b00d1406b1d4f14e7964ac 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -349,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 \
@@ -377,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...
                        :;