git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 1/3] clone: do not include authentication data in guessed dir

From
Patrick Steinhardt <ps@pks.im>
Date
Aug 6, 2015, 09:47 UTC
Message-ID
<20150806094732.GA746@pks-xps>
In-Reply-To
<xmqqmvy534m0.fsf@gitster.dls.corp.google.com>
On Wed, Aug 05, 2015 at 12:41:27PM -0700, Junio C Hamano wrote:
Show 38 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
> > For completeness, here is what I think the end result (together with
> > Peff's series) of the test should look like.
> > ...
> > Note that ssh://user:passw@rd@host:1234/ and user:passw@rd@host:/
> > tests fail for the same reason (finding @ should be greedy, I think).
> 
> And I think this should make it pass.  Just remember the last
> occurrence of '@' by moving the 'start' every time we see an '@'
> sign.
> 
>  builtin/clone.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/builtin/clone.c b/builtin/clone.c
> index cae288f..5d86439 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -160,13 +160,12 @@ static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
>  		start += 3;
>  
>  	/*
> -	 * Skip authentication data.
> +	 * Skip authentication data, if exists.
>  	 */
> -	ptr = start;
> -	while (ptr < end && !is_dir_sep(*ptr) && *ptr != '@')
> -		ptr++;
> -	if (*ptr == '@')
> -		start = ptr + 1;
> +	for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
> +		if (*ptr == '@')
> +			start = ptr + 1;
> +	}
>  
>  	/*
>  	 * Strip trailing spaces, slashes and /.git

I guess it makes sense to skip over @-signs greedily. Is there anything I need to do here or will you squash those changes in?

Previous: Junio C HamanoNext: Junio C Hamano
Message 41 of 53 in “clone: fix repo name when cloning a server's root”
  1. clone: fix repo name when cloning a server's rootPatrick Steinhardt, Jul 27, 2015
  2. Duy NguyenJul 27, 2015
  3. Patrick SteinhardtJul 27, 2015
  4. Junio C HamanoJul 27, 2015
  5. 0/6 clone: fix repo name when cloning a server's rootPatrick Steinhardt, Jul 29, 2015
  6. 1/6 tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt, Jul 29, 2015
  7. 2/6 tests: fix cleanup after tests in t1509-root-worktreePatrick Steinhardt, Jul 29, 2015
  8. 3/6 connect: expose parse_connect_url()Patrick Steinhardt, Jul 29, 2015
  9. 4/6 connect: move error check to caller of parse_connect_urlPatrick Steinhardt, Jul 29, 2015
  10. Eric SunshineJul 29, 2015
  11. Patrick SteinhardtJul 30, 2015
  12. 5/6 clone: fix hostname parsing when guessing dirPatrick Steinhardt, Jul 29, 2015
  13. Junio C HamanoJul 29, 2015
  14. Patrick SteinhardtJul 30, 2015
  15. Junio C HamanoJul 30, 2015
  16. Junio C HamanoJul 30, 2015
  17. Patrick SteinhardtAug 3, 2015
  18. Jeff KingAug 3, 2015
  19. Junio C HamanoAug 3, 2015
  20. 6/6 clone: add tests for cloning with empty pathPatrick Steinhardt, Jul 29, 2015
  21. Eric SunshineJul 30, 2015
  22. Junio C HamanoJul 31, 2015
  23. Patrick SteinhardtJul 31, 2015
  24. 0/6 fix repo name when cloning a server's rootPatrick Steinhardt, Aug 4, 2015
  25. 1/6 tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt, Aug 4, 2015
  26. 2/6 tests: fix cleanup after tests in t1509-root-worktreePatrick Steinhardt, Aug 4, 2015
  27. 3/6 clone: do not include authentication data in guessed dirPatrick Steinhardt, Aug 4, 2015
  28. 4/6 clone: do not use port number as dir namePatrick Steinhardt, Aug 4, 2015
  29. 5/6 clone: abort if no dir name could be guessedPatrick Steinhardt, Aug 4, 2015
  30. 6/6 clone: add tests for cloning with empty pathPatrick Steinhardt, Aug 4, 2015
  31. Eric SunshineAug 4, 2015
  32. Junio C HamanoAug 5, 2015
  33. Jeff KingAug 5, 2015
  34. Torsten BögershausenAug 6, 2015
  35. Junio C HamanoAug 6, 2015
  36. 0/3 fix repo name when cloning a server's rootPatrick Steinhardt, Aug 5, 2015
  37. 1/3 clone: do not include authentication data in guessed dirPatrick Steinhardt, Aug 5, 2015
  38. Junio C HamanoAug 5, 2015
  39. Junio C HamanoAug 5, 2015
  40. Junio C HamanoAug 5, 2015
  41. Patrick SteinhardtAug 6, 2015
  42. Junio C HamanoAug 7, 2015
  43. Patrick SteinhardtAug 8, 2015
  44. 2/3 clone: do not use port number as dir namePatrick Steinhardt, Aug 5, 2015
  45. 3/3 clone: abort if no dir name could be guessedPatrick Steinhardt, Aug 5, 2015
  46. Junio C HamanoAug 5, 2015
  47. 0/5 Improve guessing of repository namesPatrick Steinhardt, Aug 10, 2015
  48. 1/5 clone: add tests for output directoryPatrick Steinhardt, Aug 10, 2015
  49. 2/5 clone: use computed length in guess_dir_namePatrick Steinhardt, Aug 10, 2015
  50. 3/5 clone: do not include authentication data in guessed dirPatrick Steinhardt, Aug 10, 2015
  51. 4/5 clone: do not use port number as dir namePatrick Steinhardt, Aug 10, 2015
  52. 5/5 clone: abort if no dir name could be guessedPatrick Steinhardt, Aug 10, 2015
  53. Junio C HamanoAug 10, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.