git/remote.c, branch v2.13.2

Merge branch 'jk/drop-free-refspecs' into maint

2017-06-13T20:27:06Z

Code clean-up. * jk/drop-free-refspecs: remote: drop free_refspecs() function

Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint

2017-06-05T00:03:15Z

"foo\bar\baz" in "git fetch foo\bar\baz", even though there is no slashes in it, cannot be a nickname for a remote on Windows, as that is likely to be a pathname on a local filesystem. * js/bs-is-a-dir-sep-on-windows: Windows: do not treat a path with backslashes as a remote's nick name mingw.h: permit arguments with side effects for is_dir_sep

remote: drop free_refspecs() function

2017-06-01T00:59:00Z

We already have free_refspec(), a public function which does the same thing as the static free_refspecs(). Let's just keep one. There are two minor differences between the functions: 1. free_refspecs() is a noop when the refspec argument is NULL. This probably doesn't matter in practice. The nr_refspec parameter would presumably be 0 in that case, skipping the loop. And free(NULL) is explicitly OK. But it doesn't hurt for us to port this extra safety to free_refspec(), as one of the callers passes a funny "i+1" count. 2. The order of arguments is reversed between the two functions. This patch uses the already-public order of free_refspec(), as it matches the argument order on the parsing side. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Windows: do not treat a path with backslashes as a remote's nick name

2017-05-25T23:05:32Z

On Windows, the remote repository name in, e.g., `git fetch foo\bar` is clearly not a nickname for a configured remote repository. However, the function valid_remote_nick() does not account for backslashes. Use is_dir_sep() to check for both slashes and backslashes on Windows. This was discovered while playing with Duy's patches that warn after fopen() failures. The functions that read the branches and remotes files are protected by a valid_remote_nick() check. Without this change, a Windows style absolute path is incorrectly regarded as nickname and is concatenated to a prefix and used with fopen(). This triggers warnings because a colon in a path name is not allowed: C:\Temp\gittest>git fetch C:\Temp\gittest warning: unable to access '.git/remotes/C:\Temp\gittest': Invalid argument warning: unable to access '.git/branches/C:\Temp\gittest': Invalid argument From C:\Temp\gittest * branch HEAD -> FETCH_HEAD Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

remote: plug memory leak in match_explicit()

2017-05-08T03:18:20Z

The `guess_ref()` returns an allocated buffer of which `make_linked_ref()` does not take custody (`alloc_ref()` makes a copy), therefore we need to release the buffer afterwards. Noticed via Coverity. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'bw/push-options-recursively-to-submodules'

2017-04-20T04:37:14Z

"git push --recurse-submodules --push-option=" learned to propagate the push option recursively down to pushes in submodules. * bw/push-options-recursively-to-submodules: push: propagate remote and refspec with --recurse-submodules submodule--helper: add push-check subcommand remote: expose parse_push_refspec function push: propagate push-options with --recurse-submodules push: unmark a local variable as static

Merge branch 'jc/unused-symbols'

2017-04-17T06:29:27Z

Code cleanup. * jc/unused-symbols: remote.[ch]: parse_push_cas_option() can be static

remote: expose parse_push_refspec function

2017-04-11T07:45:22Z

A future patch needs access to the 'parse_push_refspec()' function so let's export the function so other modules can use it. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

remote.[ch]: parse_push_cas_option() can be static

2017-03-31T20:20:48Z

Since 068c77a5 ("builtin/send-pack.c: use parse_options API", 2015-08-19), there is no external user of this helper function. Signed-off-by: Junio C Hamano

Merge branch 'jn/remote-helpers-with-git-dir'

2017-02-27T21:57:16Z

"git ls-remote" and "git archive --remote" are designed to work without being in a directory under Git's control. However, recent updates revealed that we randomly look into a directory called .git/ without actually doing necessary set-up when working in a repository. Stop doing so. * jn/remote-helpers-with-git-dir: remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR remote: avoid reading $GIT_DIR config in non-repo