patchgit-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 <asheesh@asheesh.org>
---
 git-mergetool.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Asheesh Laroia <asheesh@asheesh.org> writes:

Drop "before this change,"; it is clear (and it is a recommended practice) you are first describing what problem you are addressing.

Thanks.

As a follow-up to this patch, we may want to perform a systematic audit of

    $ git grep -e 'printf "[^"]*\$[^"]*"'

There is one in git-difftool-helper.sh

    printf "\nViewing: '$MERGED'\n"

and mergetools/p4merge:

    printf "$empty_file"

I think

	printf "%s\n" "$files"

would be clearer.

On Fri, 8 Feb 2013, Junio C Hamano wrote:

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.

Asheesh Laroia <asheesh@asheesh.org> writes:

FYI, here is what I queued for now.

-- >8 --
From: Asheesh Laroia <asheesh@asheesh.org>
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 <asheesh@asheesh.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-mergetool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)