Allow git-mergetool to handle paths with a leading space

Signed-off-by: Rogan Dawes <rogan@dawes.za.net>

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 2f31fa2417300180662b66afdde11bdf1d6febb2..cbbb707959cc64427f7bbd7bfefb0a8f0f263596 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -393,8 +393,11 @@ if test $# -eq 0 ; then
                echo "No files need merging"
                exit 0
        fi
-       echo Merging the files: $files
-       git ls-files -u | sed -e 's/^[^ ]*      //' | sort -u | while read i
+       echo Merging the files: "$files"
+       git ls-files -u |
+       sed -e 's/^[^   ]*      //' |
+       sort -u |
+       while IFS= read i
        do
                printf "\n"
                merge_file "$i" < /dev/tty > /dev/tty