summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-02-09 17:21:25 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-10 11:35:50 -0800
commit2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 (patch)
treedef741b5990a47116500fb86b767c9cb61948794 /git-difftool--helper.sh
parent59cf706b2381d99b39c4d1daf62da9eeccf0ec13 (diff)
downloadgit-2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5.tar.gz
difftool--helper: fix printf usage
Do not use a random string as if it is a format string for printf when showing it literally; instead feed it to '%s' format. Reported-by: Asheesh Laroia <asheesh@asheesh.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool--helper.sh')
-rwxr-xr-xgit-difftool--helper.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 3d0fe0cd93..b00ed95dba 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -40,7 +40,7 @@ launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool.
if should_prompt
then
- printf "\nViewing: '$MERGED'\n"
+ printf "\nViewing: '%s'\n" "$MERGED"
if use_ext_cmd
then
printf "Launch '%s' [Y/n]: " \