summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-05-23 05:19:44 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-24 16:48:34 -0700
commit9d2e942070b235e1f4a0b8dd4c55a6b3f0fe914a (patch)
tree9b5415483a8e35198ab92e188cc98230f8966baf /merge-file.c
parentmake url-related functions reusable (diff)
downloadtgif-9d2e942070b235e1f4a0b8dd4c55a6b3f0fe914a.tar.xz
decode file:// and ssh:// URLs
We generally treat these as equivalent to "/path/to/repo" and "host:path_to_repo" respectively. However, they are URLs and as such may be percent-encoded. The current code simply uses them as-is without any decoding. With this patch, we will now percent-decode any file:// or ssh:// url (or ssh+git, git+ssh, etc) at the transport layer. We continue to treat plain paths and "host:path" syntax literally. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions