From: David Aguilar <davvid@gmail.com>
Date: Sun, 10 Feb 2013 01:21:25 +0000 (-0800)
Subject: difftool--helper: fix printf usage
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5;p=git.git

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

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 3d0fe0cd9..b00ed95db 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]: " \