Allow git-mergetool to handle paths with a leading space

Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
git-mirror · Jan 8, 2008 · 2e8fd78 · 2e8fd78
1 parent 7ec4395
commit 2e8fd78
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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