diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-23 10:27:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-23 10:42:07 -0700 |
| commit | ce83eda15554ffd859ecc9f4c427303d460dab60 (patch) | |
| tree | d8a4f1b37cd4cbe413e0609326decd64d11f953d /builtin/merge-ours.c | |
| parent | decode file:// and ssh:// URLs (diff) | |
| download | tgif-ce83eda15554ffd859ecc9f4c427303d460dab60.tar.xz | |
url.c: "<scheme>://" part at the beginning should not be URL decoded
When using the protocol git+ssh:// for example we do not want to
decode the '+' as a space. The url decoding must take place only
for the server name and parameters.
This fixes a regression introduced in 9d2e942.
Initial-fix-by: Pascal Obry <pascal.obry@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions