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>
David Aguilar committed
Feb 9, 2013 at 17:21 UTC
2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5
1 file changed
+1
-1
git-difftool--helper.sh
+1
-1
@@ -40,7 +40,7 @@ launch_merge_tool () {
40
# the user with the real $MERGED name before launching $merge_tool.
41
if should_prompt
42
then
43
- printf "\nViewing: '$MERGED'\n"
43
+ printf "\nViewing: '%s'\n" "$MERGED"
44
if use_ext_cmd
45
then
46
printf "Launch '%s' [Y/n]: " \