diff options
| author | David Aguilar <davvid@gmail.com> | 2013-02-09 17:21:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-10 11:40:52 -0800 |
| commit | d272c8497c2a38ecc9608f8580f7dc3587168168 (patch) | |
| tree | a37bde0cb9e59ea1fd751bcf25e4c79cef6dd269 /mergetools | |
| parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (diff) | |
| download | git-d272c8497c2a38ecc9608f8580f7dc3587168168.tar.gz git-d272c8497c2a38ecc9608f8580f7dc3587168168.tar.xz | |
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')
| -rw-r--r-- | mergetools/p4merge | 2 |
1 files changed, 1 insertions, 1 deletions
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" } |