[PATCH v4 2/3] clone: do not use port number as dir name
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Aug 5, 2015, 10:06 UTC
- Message-ID
- <1438769179-5943-3-git-send-email-ps@pks.im>
- In-Reply-To
- <1438769179-5943-1-git-send-email-ps@pks.im>
If the URI contains a port number and the URI's path component is empty we fail to guess a sensible directory name. E.g. cloning a repository 'ssh://example.com:2222/' we guess a directory name '2222' where we would want the hostname only, e.g. 'example.com'.
Fix this by stripping trailing port numbers.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/clone.c | 17 +++++++++++++++++ t/t5603-clone-dirname.sh | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 3ddf8b9..7d93e13 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -181,6 +181,23 @@ static char *guess_dir_name(const char *repo, int is_bundle, int is_bare) } /* + * Strip trailing port number if we've got only a + * hostname (that is, there is no dir separator but a + * colon). This check is required such that we do not + * strip URI's like '/foo/bar:2222.git', which should + * result in a dir '2222' being guessed due to backwards + * compatibility. + */ + if (memchr(start, '/', end - start) == NULL + && memchr(start, ':', end - start) != NULL) { + ptr = end; + while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':') + ptr--; + if (start < ptr && ptr[-1] == ':') + end = ptr - 1; + } + + /* * Find last component. To remain backwards compatible we * also regard colons as path separators, such that * cloning a repository 'foo:bar.git' would result in a diff --git a/t/t5603-clone-dirname.sh b/t/t5603-clone-dirname.sh index 3a454f9..27dbd6c 100755 --- a/t/t5603-clone-dirname.sh +++ b/t/t5603-clone-dirname.sh @@ -63,8 +63,13 @@ test_clone_dir ssh://host/foo/.git/ foo # omitting the path should default to the hostname test_clone_dir ssh://host/ host -test_clone_dir ssh://host:1234/ host fail +test_clone_dir ssh://host:1234/ host test_clone_dir ssh://user@host/ host test_clone_dir ssh://user:password@host/ host +test_clone_dir ssh://user:password@host:1234/ host + +# trailing port-like numbers should not be stripped for paths +test_clone_dir ssh://user:password@host/test:1234 1234 +test_clone_dir ssh://user:password@host/test:1234.git 1234 test_done
-- 2.5.0