From: Junio C Hamano Date: Fri, 08 Feb 2013 21:09:56 GMT Subject: Re: [PATCH] git-mergetool: print filename when it contains % Message-ID: <7vliayzf4r.fsf@alter.siamese.dyndns.org> In-Reply-To: Asheesh Laroia writes: > Junio, thanks for the quick reply! I agree with your suggestions, and > will take a look at addressing them, hopefully by Tuesday or so. FYI, here is what I queued for now. -- >8 -- From: Asheesh Laroia Date: Thu, 7 Feb 2013 17:16:24 -0800 Subject: [PATCH] git-mergetool: print filename when it contains % If git-mergetool was invoked with 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 Do not pass random string to printf as if it were a valid format. Use format string "%s" and pass the string as a data to be formatted instead. Signed-off-by: Asheesh Laroia Signed-off-by: Junio C Hamano --- git-mergetool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index c50e18a..012afa5 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -440,7 +440,7 @@ then fi printf "Merging:\n" -printf "$files\n" +printf "%s\n" "$files" IFS=' ' -- 1.8.1.3.617.gb5c8e72