Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
difftool--helper: fix printf usage
author
David Aguilar
<davvid@gmail.com>
Sun, 10 Feb 2013 01:21:25 +0000
(17:21 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Feb 2013 19:35:50 +0000
(11:35 -0800)
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>
git-difftool--helper.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
59cf706
)
diff --git
a/git-difftool--helper.sh
b/git-difftool--helper.sh
index 3d0fe0cd93b393a5f376aa10505e927fbed37f8f..b00ed95dba9c035ee812d3a2d6db2d13a1944a33 100755
(executable)
--- a/
git-difftool--helper.sh
+++ b/
git-difftool--helper.sh
@@
-40,7
+40,7
@@
launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool.
if should_prompt
then
- printf "\nViewing: '
$MERGED'\n
"
+ printf "\nViewing: '
%s'\n" "$MERGED
"
if use_ext_cmd
then
printf "Launch '%s' [Y/n]: " \