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

p4merge: 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/mergetools/p4merge b/mergetools/p4merge
index 52f7c8f70..8a3691656 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -30,5 +30,5 @@ create_empty_file () {
 	empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
 	>"$empty_file"
 
-	printf "$empty_file"
+	printf "%s" "$empty_file"
 }