git/builtin/clone.c, branch v2.5.2

Merge branch 'jk/guess-repo-name-regression-fix' into maint

2015-08-25T23:09:17Z

"git clone $URL" in recent releases of Git contains a regression in the code that invents a new repository name incorrectly based on the $URL. This has been corrected. * jk/guess-repo-name-regression-fix: clone: use computed length in guess_dir_name clone: add tests for output directory

clone: use computed length in guess_dir_name

2015-08-10T18:01:05Z

Commit 7e837c6 (clone: simplify string handling in guess_dir_name(), 2015-07-09) changed clone to use strip_suffix instead of hand-rolled pointer manipulation. However, strip_suffix will strip from the end of a NUL-terminated string, and we may have already stripped some characters (like directory separators, or "/.git"). This leads to commands like: git clone host:foo.git/ failing to strip the ".git". We must instead convert our pointer arithmetic into a computed length and feed that to strip_suffix_mem, which will then reduce the length further for us. It would be nicer if we could drop the pointer manipulation entirely, and just continually strip using strip_suffix. But that doesn't quite work for two reasons: 1. The early suffixes we're stripping are not constant; we need to look for is_dir_sep, which could be one of several characters. 2. Mid-way through the stripping we compute the pointer "start", which shows us the beginning of the pathname. Which really give us two lengths to work with: the offset from the start of the string, and from the start of the path. By using pointers for the early part, we can just compute the length from "start" when we need it. Signed-off-by: Jeff King Acked-by: Sebastian Schuberth Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

Merge branch 'ss/clone-guess-dir-name-simplify'

2015-07-13T21:00:28Z

Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name()

clone: simplify string handling in guess_dir_name()

2015-07-09T21:21:29Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

Merge branch 'jk/clone-dissociate' into maint

2015-06-16T21:33:52Z

Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference

Merge branch 'jk/clone-dissociate'

2015-06-11T16:29:52Z

Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference

Merge branch 'mh/clone-verbosity-fix' into maint

2015-06-05T19:00:08Z

Git 2.4 broke setting verbosity and progress levels on "git clone" with native transports. * mh/clone-verbosity-fix: clone: call transport_set_verbosity before anything else on the newly created transport

clone: reorder --dissociate and --reference options

2015-05-27T19:37:39Z

These options are intimately related, so it makes sense to list them nearby in the "-h" output (they are already adjacent in the manpage). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

clone: use OPT_STRING_LIST for --reference

2015-05-27T19:37:28Z

Not only does this save us having to implement a custom callback, but it handles "--no-reference" in the usual way (to clear the list). The generic callback does copy the string, which we don't technically need, but that should not hurt anything. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'mh/clone-verbosity-fix'

2015-05-22T19:41:56Z