Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 2a9ccff

Browse files
davvidgitster
authored andcommitted
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 <[email protected]> Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 59cf706 commit 2a9ccff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-difftool--helper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ launch_merge_tool () {
4040
# the user with the real $MERGED name before launching $merge_tool.
4141
if should_prompt
4242
then
43-
printf "\nViewing: '$MERGED'\n"
43+
printf "\nViewing: '%s'\n" "$MERGED"
4444
if use_ext_cmd
4545
then
4646
printf "Launch '%s' [Y/n]: " \

0 commit comments

Comments
 (0)