Allow git-mergetool to handle paths with a leading space
Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
Rogan Dawes committed
Jan 7, 2008 at 09:37 UTC
2e8fd7819521b43e89f3baa9c6a95042ed7da4b4
1 file changed
+5
-2
git-mergetool.sh
+5
-2
@@ -393,8 +393,11 @@ if test $# -eq 0 ; then
393
echo "No files need merging"
394
exit 0
395
fi
396
- echo Merging the files: $files
397
- git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i
396
+ echo Merging the files: "$files"
397
+ git ls-files -u |
398
+ sed -e 's/^[^ ]* //' |
399
+ sort -u |
400
+ while IFS= read i
401
do
402
printf "\n"
403
merge_file "$i" < /dev/tty > /dev/tty