diff options
author | Jeff King <peff@peff.net> | 2010-01-13 12:35:31 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-14 09:24:42 -0800 |
commit | 0a0416a34a7ef5c64f4e0226371e4cab8c1ba982 (patch) | |
tree | 76ce0e33cbe408a9ead5d29f66a1ec171a8d106c /daemon.c | |
parent | 902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff) | |
download | git-0a0416a34a7ef5c64f4e0226371e4cab8c1ba982.tar.gz |
strbuf_expand: convert "%%" to "%"
The only way to safely quote arbitrary text in a pretty-print user
format is to replace instances of "%" with "%x25". This is slightly
unreadable, and many users would expect "%%" to produce a single
"%", as that is what printf format specifiers do.
This patch converts "%%" to "%" for all users of strbuf_expand():
(1) git-daemon interpolated paths
(2) pretty-print user formats
(3) merge driver command lines
Case (1) was already doing the conversion itself outside of
strbuf_expand(). Case (2) is the intended beneficiary of this patch.
Case (3) users probably won't notice, but as this is user-facing
behavior, consistently providing the quoting mechanism makes sense.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
-rw-r--r-- | daemon.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -147,7 +147,6 @@ static char *path_ok(char *directory) { "IP", ip_address }, { "P", tcp_port }, { "D", directory }, - { "%", "%" }, { NULL } }; |