| commit | 59cf706b2381d99b39c4d1daf62da9eeccf0ec13 | |
| author | Asheesh Laroia <asheesh@asheesh.org> | |
| Fri, 8 Feb 2013 01:16:24 +0000 (7 17:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 Feb 2013 21:10:06 +0000 (8 13:10 -0800) | ||
| tree | c24b7f9a3bdd9e66dac70f31aadc78c222f569a1 | treesnapshot (tar.gz zip) |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 | commitdiff |
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 data to be formatted
instead.
Signed-off-by: Asheesh Laroia <asheesh@asheesh.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 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 | diffblobblamehistory |