summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorAsheesh Laroia <asheesh@asheesh.org>2013-02-07 17:16:24 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-08 13:10:06 -0800
commit59cf706b2381d99b39c4d1daf62da9eeccf0ec13 (patch)
treec24b7f9a3bdd9e66dac70f31aadc78c222f569a1 /git-mergetool.sh
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-59cf706b2381d99b39c4d1daf62da9eeccf0ec13.tar.gz
git-mergetool: print filename when it contains %
If git-mergetool was invoked with files with a percent sign (%) in their names, it would print an error. For example, if you were calling mergetool on a file called "%2F": printf: %2F: invalid directive Do not pass random string to printf as if it were a valid format. Use format string "%s" and pass the string as data to be formatted instead. Signed-off-by: Asheesh Laroia <asheesh@asheesh.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index c50e18a899..012afa5549 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -440,7 +440,7 @@ then
fi
printf "Merging:\n"
-printf "$files\n"
+printf "%s\n" "$files"
IFS='
'