Permalink
Browse files

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>
  • Loading branch information...
1 parent 59cf706 commit 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 @davvid davvid committed with gitster Feb 10, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 git-difftool--helper.sh
View
@@ -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]: " \

0 comments on commit 2a9ccff

Please sign in to comment.