[PATCH] git-mergetool: print filename when it contains %

From: Asheesh Laroia <asheesh@asheesh.org>
Date: Feb 8, 2013, 01:16 UTC
Message-ID: <1360286184-14278-1-git-send-email-asheesh@asheesh.org>

Before this change, if git-mergetool was invoked with regard to files with a percent sign (%) in their names, it would print an error. For example, if you were calling mergetool on a file called "%2F":

    printf: %2F: invalid directive

This changes the behavior to pass "%s" to printf as its first argument to avoid processing the filename as a format string.

Signed-off-by: Asheesh Laroia <asheesh@asheesh.org>
---
 git-mergetool.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c50e18a..d2b9289 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -440,7 +440,7 @@ then
 fi
 
 printf "Merging:\n"
-printf "$files\n"
+printf "%s" "$files\n"
 
 IFS='
 '

-- 
1.7.10.4