Permalink
Browse files

Merge branch 'al/mergetool-printf-fix'

* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %
  • Loading branch information...
2 parents 393b7c3 + 2a9ccff commit ba56d7057a5da9eb3485391658ba7465c855a8f3 @gitster gitster committed Feb 14, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 git-difftool--helper.sh
  2. +1 −1 git-mergetool.sh
View
2 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]: " \
View
2 git-mergetool.sh
@@ -403,7 +403,7 @@ then
fi
printf "Merging:\n"
-printf "$files\n"
+printf "%s\n" "$files"
IFS='
'

0 comments on commit ba56d70

Please sign in to comment.