In Mercurial ssh urls, the path part of the url is relative to the home
directory of the account being logged to instead of being absolute.
Add a flag allowing git_connect() to handle this kind of usecase.
Signed-off-by: Mike Hommey <m...@glandium.org>
---
connect.c | 10 +++++++---
connect.h | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/connect.c b/connect.c
index 9feedd8..0df6297 100644
--- a/connect.c
+++ b/connect.c
@@ -592,7 +592,7 @@ static char *get_port(char *host)
* The caller must free() the returned strings.
*/
static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
- char **ret_path)
+ char **ret_path, int relative_ssh)
{
char *url;
char *host, *path;
@@ -642,7 +642,10 @@ static enum protocol parse_connect_url(const char
*url_orig, char **ret_host,
end = path; /* Need to \0 terminate host here */
if (separator == ':')
path++; /* path starts after ':' */
- if (protocol == PROTO_GIT || protocol == PROTO_SSH) {
+ if (protocol == PROTO_SSH && relative_ssh) {
+ if (path[0] == separator)
+ path++;
+ } else if (protocol == PROTO_GIT || protocol == PROTO_SSH) {
if (path[1] == '~')
path++;
}
@@ -712,7 +715,8 @@ struct child_process *git_connect(int fd[2], const char
*url,
*/
signal(SIGCHLD, SIG_DFL);
- protocol = parse_connect_url(url, &hostandport, &path);
+ protocol = parse_connect_url(url, &hostandport, &path,
+ flags & CONNECT_RELATIVE_SSH);
if ((flags & CONNECT_DIAG_URL) && (protocol != PROTO_SSH)) {
printf("Diag: url=%s\n", url ? url : "NULL");
printf("Diag: protocol=%s\n", prot_name(protocol));
diff --git a/connect.h b/connect.h
index fb3331b..1377028 100644
--- a/connect.h
+++ b/connect.h
@@ -6,6 +6,7 @@
#define CONNECT_IPV4 (1u << 2)
#define CONNECT_IPV6 (1u << 3)
#define CONNECT_WANT_STDERR (1u << 4)
+#define CONNECT_RELATIVE_SSH (1u << 5)
extern struct child_process *git_connect(int fd[2], const char *url, const
char *prog, int flags);
extern int finish_connect(struct child_process *conn);
extern int git_connection_is_socket(struct child_process *conn);
--
2.8.1.5.g18c8a48
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
