undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow git-mergetool to handle paths with a leading space

Browse Source 
Signed-off-by: Rogan Dawes <rogan@dawes.za.net>
This commit is contained in:
Rogan Dawes 2008-01-07 09:37:38 +02:00 committed by Junio C Hamano
parent 7ec43959f7
commit 2e8fd78195
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-mergetool.sh
View File

@ -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