summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-02-10 01:21:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-10 19:40:52 (GMT)
commitd272c8497c2a38ecc9608f8580f7dc3587168168 (patch)
treea37bde0cb9e59ea1fd751bcf25e4c79cef6dd269 /mergetools/p4merge
parent950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (diff)
downloadgit-d272c8497c2a38ecc9608f8580f7dc3587168168.zip
git-d272c8497c2a38ecc9608f8580f7dc3587168168.tar.gz
git-d272c8497c2a38ecc9608f8580f7dc3587168168.tar.bz2
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>
Diffstat (limited to 'mergetools/p4merge')
-rw-r--r--mergetools/p4merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 52f7c8f..8a36916 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"
}