From: Rogan Dawes <rogan@dawes.za.net>
Date: Mon, 7 Jan 2008 07:37:38 +0000 (+0200)
Subject: Allow git-mergetool to handle paths with a leading space
X-Git-Tag: v1.5.4-rc3~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2e8fd7819521b43e89f3baa9c6a95042ed7da4b4;p=git.git

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 2f31fa241..cbbb70795 100755
--- 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