Re: [PATCH] git-mergetool: print filename when it contains %
On Fri, 8 Feb 2013, Junio C Hamano wrote: Asheesh Laroia ashe...@asheesh.org writes: Before this change, if git-mergetool was invoked with regard to Drop before this change,; it is clear (and it is a recommended practice) you are first describing what problem you are addressing. Junio, thanks for the quick reply! I agree with your suggestions, and will take a look at addressing them, hopefully by Tuesday or so. -- Asheesh. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] git-mergetool: print filename when it contains %
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 ashe...@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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
