1. Stefan Saasen
  2. git

Commits

Rogan Dawes  committed 2e8fd78

Allow git-mergetool to handle paths with a leading space

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

  • Participants
  • Parent commits 7ec4395
  • Branches master

Comments (0)

Files changed (1)

File git-mergetool.sh

View file
 		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