upgrade libgit2 and release as 8w-2023-01-30 (#28)

* net: move url tests into util

* url: remove invalid scp url parsing test

The url::scp::invalid_addresses test attempts to test an invalid IPv6
address. It does not, it calls the regular URL parsing function which
treats it like a possibly invalid scheme.

* url: test that we don't expand % encoding in paths

* url_parse: introduce our own url parsing

Provide our own url parser, so that we can handle Google Code's "fun"
URLs that have a userinfo with an `@` in it. :cry:

* url: only allow @s in usernames for ssh urls

Enforce the RFC for other protocols; Google's questionable choices about
malformed SSH protocols shouldn't impact our ability to properly parse
HTTPS.

* push: revparse refspec source, so you can push things that are not refs

I want to push a commit by OID to a remote branch. Currently, push parses the refspecs such that the source must be the name of a ref (it uses git_reference_name_to_id to resolve it). This commit changes it so push uses git_revparse_single to resolve the source of the refspec. This allows for OIDs or other revs (e.g. `HEAD~2`) to be pushed.

* clone: test long custom header

* winhttp: handle long custom headers

* Don't fail the whole clone if you can't find a default branch

In commit 6bb3587 ("clone: set refs/remotes/origin/HEAD to default
branch when branch is specified, attempt 2") libgit2 was changed to set
the default remote branch when one was copied.

But it makes update_head_to_branch() return an error if the origin
doesn't even *have* a HEAD in the first place, since
git_remote_default_branch() will fail.

That's entirely wrong, and means that you cannot do "git_clone()" of a
particular branch on a remote repository when that remote doesn't have a
default branch at all.

So don't set the error code.

Signed-off-by: Linus Torvalds <[email protected]>

* fix compile on Windows with -DWIN32_LEAN_AND_MEAN

ensure the needed wincrypt.h is included

* Fix libgit2#6365

* Fix memory leak

Signed-off-by: Sven Strickroth <[email protected]>

* libgit2#6366: When a worktree is missing, return GIT_ENOTFOUND.

* Delete create.c.bak

* ci: move to macos-11

GitHub has deprecated macOS 10.15; move to their new macOS 11 build
servers.

* ci: clean up daemon processes on exit

We previously (correctly) cleaned up the git daemon and SSH server, but
failed to clean up our bespoke HTTP server and HTTP proxies. Capture
their PIDs on process creation and kill them when we shut down.

* clone: narrow success tests on HEAD-less remotes

Only allow the remote default branch checking to fail when the remote
default branch doesn't exist (`git_remote__default_branch` returns
`GIT_ENOTFOUND`). If there was any other type of error - for example, an
allocation failure - we should not swallow that and continue to fail.

This allows us to support the case when a remote has not advertised a
HEAD -- this is possible, for example, when the remote has constrained
the caller to a particular namespace. But other remote failures remain
as failures.

* clone: test bare clone namespaced repo with no HEAD

Test that we can successfully clone a repository that is namespace
scoped to a bare repository locally. We need not specify a checkout
branch in this case (obviously, since we do not check anything out in a
bare clone).

* clone: test for cloning a repo with namespace scope

Test that we can successfully clone a repository that is namespace
scoped on the remote and does not advertise a HEAD. To do this, we must
specify the branch to checkout.

* Update src/util/rand.c

* tests: skip sha256 tests when not compiled in

Actually `cl_skip` the sha256 tests when we're not compiled for sha256,
instead of passing them.

* cmake: provide empty experimental.h for non-cmake users

Not everybody builds libgit2 using cmake; provide an `experimental.h`
with no experiments configured for those that do not. To support this,
we also now create compile definitions for experimental functionality,
to supplant that empty `experimental.h`. cmake will continue to generate
the proper `experimental.h` file for use with `make install`.

* repo: test ownership validation fails with expected error

* repo: ignore missing 'safe.directory' config during ownership checks

* add 2-clause BSD license to COPYING

The `git_fs_path_basename_r()` function in `src/util/fs_path.c` says
it's based on Android code using the 2-clause BSD license, so I
suppose that means the COPYING file should include that.

* benchmark: update path

The path to the default CLI output has changed, update it.

* http: Update httpclient options when reusing an existing connection.

Httpclient internally stores a copy of the certificate_check callback and
payload. When connecting via HTTPS, and if the server sends back
"Connection: close" after the first request, the following request would
attempt to re-use the httpclient and call the (now outdated) callback. In
particular for pygit2 this is a problem, since callbacks / payloads are only
valid for the duration of a libgit2 call, leading to a ffi.from_handle()
error and crashing the Python interpreter.

* ssh: verify the remote's host key against known_hosts if it exists

It turns out this has been available in libssh2 for a long time and we should
have been verifying this the whole time.

* Fix leak in git_tag_create_from_buffer

If the tag already exists and we are not forcing overwrite we need to free ref_name buffer before return the "tag already exists" error.

* Missing dispose

* Missing dispose in git_tag_create__internal

* commit-graph: only verify csum on git_commit_graph_open().

It is expensive to compute the sha1 of the entire commit-graph file each
time we open it. Git only does this if it is re-writing the file.

This patch will only verify the checksum when calling the external API
git_commit_graph_open(), which explicitly says it opens and verifies
the commit graph in the documentation.

For internal library calls, we call git_commit_graph_get_file(), which
mmaps the commit-graph file in read-only mode. Therefore it is safe to
skip the validation check there.

Tests were added to check that the validation works in the happy path,
and prevents us from opening the file when validation fails.

(Note from Derrick Stolee: This patch was applied internally at GitHub
after we recognized the performance impact it had during an upgrade of
libgit2. The original author left the company before we remembered to
send it upstream.)

Signed-off-by: Derrick Stolee <[email protected]>

* tests: append the github.com ssh keys so we have access during tests

Currently just the one test needs it.

The ssh-rsa makes sure we're asking for the cipher we find in `known_hosts` as
that won't be the one selected by default. This will be relevant in later changes.

* tests: move online::clone::ssh_auth_methods into the ssh test suite

We're currently running it as part of the online suite but that doesn't have any
setup for ssh so we won't find the GitHub keys we set up during the test.

It doesn't need the private key setup as we just want to make sure we see some
auth request from the server, but with the addition of hostkey checking we're
now seeing it fail when we skip these tests.

* ssh: look for a key in known_hosts to set the key type for the handshake

The server and client negotiate a single hostkey, but the "best" cipher may not
be the one for which we have an entry in `known_hosts`. This can lead to us not
finding the key in known_hosts even though we should be connecting.

Instead here we look up the hostname with a nonsense key to perform a lookup in
the known hosts and set that. This is roughly what the OpenSSH client does as
well.

* commit_graph: use uint64_t for arithmetic

This should resolve some issues with UBSan builds by using unsigned
64-bit integers for all arithmetic until we finally convert to an offset
or size value.

Signed-off-by: Derrick Stolee <[email protected]>

* Add support for "safe.directory *"

Signed-off-by: Sven Strickroth <[email protected]>

* thread: avoid warnings when building without threads

`git__noop` takes no arguments, so a simple `#define func(a) git__noop`
will produce warnings about the unused `a`. Introduce `git__noop_args`
to swallow arguments and avoid that warning.

* tests: Add new test to submodule::update

Verify that trying to update submodule which has been configured but not added does return an error.

Issue libgit2#6433: git_submodule_update fails to update configured but missing submodule

* submodule: Do not try to update a missing submodule

If a submodule has been configured but not yet added, do not try to update it.

Issue libgit2#6433: git_submodule_update fails to update configured but missing submodule

* transport: fix capabilities calculation

This looks like a typo to me, from what i can see these lines were
added at the same time and because of how capabilities are calculated,
it's likely that this code will work in situations where these
capabilities were the last ones.

* Use `git_clone__submodule` to avoid file checks in workdir

`git_clone` checks for existence of (non-empty) directories that would clash with what is about to be cloned.

This is problematic when cloning submodules since they make sense in the context of a parent module, so they should not use the current working dir.

Since in `git_submodule_update` we clone the submodule only when it is not yet initialized we do not need to perform directory checks.

* README: show v1.5 and v1.4 branch builds

* ci: update version numbers of actions

* push: use resolved oid as the source

211c971 attempts to use the parsed OID
but inverted the arguments to `git_oid_cpy`.

* src: hide unused hmac() prototype

It conflicts with NetBSD's in its libc.

Closes libgit2#6457

* hash: drop all declarations from hmac

The builtin hash uses the code verbatim from rfc6234, including
prototypes for functions that we don't use (like hmac). Remove all
unused prototypes to avoid collisions with things that an operating
system might provide (like hmac).

* tests: update clar test runner

Update to the latest main version of clar, which includes improved xml
summary output.

* tests: fix clar declarations

* clar: cross-platform elapsed time counter

Abstract time counter for tests; use gettimeofday on Unix and
GetTickCount on Windows.

* ci: always create test summaries, even on failure

When the dependent jobs fail -- possibly due to test failures -- we
should still produce the job summary that shows those test failures.

* ci: update upload-artifact dependency

* ci: upgrade test-summary action

* Get libgit2 working for 8thwall. (#24)

Upgrade libgit2 with support for 8thwall cloud editor.

---------

Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Sven Strickroth <[email protected]>
Signed-off-by: Derrick Stolee <[email protected]>
Co-authored-by: Edward Thomson <[email protected]>
Co-authored-by: Sven Over <[email protected]>
Co-authored-by: Kevin Saul <[email protected]>
Co-authored-by: Linus Torvalds <[email protected]>
Co-authored-by: Christoph Cullmann <[email protected]>
Co-authored-by: Vinz2008 <[email protected]>
Co-authored-by: Sven Strickroth <[email protected]>
Co-authored-by: Miguel Arroz <[email protected]>
Co-authored-by: Laurence McGlashan <[email protected]>
Co-authored-by: Martin von Zweigbergk <[email protected]>
Co-authored-by: Sebastian Lackner <[email protected]>
Co-authored-by: Carlos Martín Nieto <[email protected]>
Co-authored-by: Julian Mesa <[email protected]>
Co-authored-by: Colin Stolley <[email protected]>
Co-authored-by: Derrick Stolee <[email protected]>
Co-authored-by: Edward Thomson <[email protected]>
Co-authored-by: tagesuhu <[email protected]>
Co-authored-by: Russell Sim <[email protected]>
Co-authored-by: Aleš Bizjak <[email protected]>
Co-authored-by: Thomas Klausner <[email protected]>

Author: 21 people

.github/workflows/benchmark.yml

@@ -27,7 +27,7 @@ jobs:
           os: ubuntu-latest
           setup-script: ubuntu
         - name: "macOS"
-          os: macos-10.15
+          os: macos-11
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
@@ -50,7 +50,7 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -66,9 +66,9 @@ jobs:
     - name: Benchmark
       run: |
         if [[ "$(uname -s)" == MINGW* ]]; then
-          GIT2_CLI="$(cygpath -w $(pwd))\\build\\Release\\git2_cli"
+          GIT2_CLI="$(cygpath -w $(pwd))\\build\\Release\\git2"
         else
-          GIT2_CLI="$(pwd)/build/git2_cli"
+          GIT2_CLI="$(pwd)/build/git2"
         fi
 
         mkdir benchmark && cd benchmark

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
     name: "Create container: ${{ matrix.container.name }}"
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -122,7 +122,7 @@ jobs:
           os: ubuntu-latest
         - name: "macOS"
           id: macos
-          os: macos-10.15
+          os: macos-11
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
@@ -230,7 +230,7 @@ jobs:
           os: ubuntu-latest
         - name: "macOS (SHA256)"
           id: macos
-          os: macos-10.15
+          os: macos-11
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON -DEXPERIMENTAL_SHA256=ON
@@ -253,7 +253,7 @@ jobs:
     name: "Build: ${{ matrix.platform.name }}"
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -323,12 +323,13 @@ jobs:
   test_results:
     name: Test results
     needs: [ build ]
+    if: always()
     runs-on: ubuntu-latest
     steps:
     - name: Download test results
       uses: actions/download-artifact@v3
     - name: Generate test summary
-      uses: test-summary/action@v1
+      uses: test-summary/action@v2
       with:
         paths: 'test-results-*/*.xml'
 
@@ -345,7 +346,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -364,7 +365,7 @@ jobs:
             cm doc api.docurium
         git checkout gh-pages
         zip --exclude .git/\* --exclude .gitignore --exclude .gitattributes -r api-documentation.zip .
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       name: Upload artifact
       with:
         name: api-documentation

.github/workflows/nightly.yml

@@ -154,7 +154,7 @@ jobs:
             SKIP_SSH_TESTS: true
           os: ubuntu-latest
         - name: "macOS"
-          os: macos-10.15
+          os: macos-11
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
@@ -271,7 +271,7 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -333,7 +333,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: source
         fetch-depth: 0
@@ -358,13 +358,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: 'cpp'
 
@@ -376,4 +376,4 @@ jobs:
         cmake --build .
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

COPYING

@@ -1184,3 +1184,33 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+----------------------------------------------------------------------
+
+The built-in git_fs_path_basename_r() function is based on the
+Android implementation, BSD licensed:
+
+Copyright (C) 2008 The Android Open Source Project
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

README.md

@@ -4,8 +4,8 @@ libgit2 - the Git linkable library
 | Build Status | |
 | ------------ | - |
 | **main** branch CI builds | [![CI Build](https://github.com/libgit2/libgit2/workflows/CI%20Build/badge.svg?event=push)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush) |
+| **v1.5 branch** CI builds | [![CI Build](https://github.com/libgit2/libgit2/workflows/CI%20Build/badge.svg?branch=maint%2Fv1.5&event=push)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.5) |
 | **v1.4 branch** CI builds | [![CI Build](https://github.com/libgit2/libgit2/workflows/CI%20Build/badge.svg?branch=maint%2Fv1.4&event=push)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.4) |
-| **v1.3 branch** CI builds | [![CI Build](https://github.com/libgit2/libgit2/workflows/CI%20Build/badge.svg?branch=maint%2Fv1.3&event=push)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.3) |
 | **Nightly** builds | [![Nightly Build](https://github.com/libgit2/libgit2/workflows/Nightly%20Build/badge.svg)](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22Nightly+Build%22) [![Coverity Scan Status](https://scan.coverity.com/projects/639/badge.svg)](https://scan.coverity.com/projects/639) |
 
 `libgit2` is a portable, pure C implementation of the Git core methods

ci/test.sh

@@ -22,13 +22,33 @@ CONTINUE_ON_FAILURE=0
 cleanup() {
 	echo "Cleaning up..."
 
-	if [ ! -z "$GITDAEMON_PID" ]; then
-		echo "Stopping git daemon..."
-		kill $GITDAEMON_PID
+	if [ ! -z "$GIT_STANDARD_PID" ]; then
+		echo "Stopping git daemon (standard)..."
+		kill $GIT_STANDARD_PID
+	fi
+
+	if [ ! -z "$GIT_NAMESPACE_PID" ]; then
+		echo "Stopping git daemon (namespace)..."
+		kill $GIT_NAMESPACE_PID
+	fi
+
+	if [ ! -z "$PROXY_BASIC_PID" ]; then
+		echo "Stopping proxy (Basic)..."
+		kill $PROXY_BASIC_PID
+	fi
+
+	if [ ! -z "$PROXY_NTLM_PID" ]; then
+		echo "Stopping proxy (NTLM)..."
+		kill $PROXY_NTLM_PID
+	fi
+
+	if [ ! -z "$HTTP_PID" ]; then
+		echo "Stopping HTTP server..."
+		kill $HTTP_PID
 	fi
 
 	if [ ! -z "$SSHD_DIR" -a -f "${SSHD_DIR}/pid" ]; then
-		echo "Stopping SSH..."
+		echo "Stopping SSH server..."
 		kill $(cat "${SSHD_DIR}/pid")
 	fi
 
@@ -80,40 +100,46 @@ echo "##########################################################################
 echo "## Configuring test environment"
 echo "##############################################################################"
 
+echo ""
+
 if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
-	echo "Starting git daemon..."
-	GITDAEMON_DIR=`mktemp -d ${TMPDIR}/gitdaemon.XXXXXXXX`
-	git init --bare "${GITDAEMON_DIR}/test.git" >/dev/null
-	git daemon --listen=localhost --export-all --enable=receive-pack --base-path="${GITDAEMON_DIR}" "${GITDAEMON_DIR}" 2>/dev/null &
-	GITDAEMON_PID=$!
-	disown $GITDAEMON_PID
+	echo "Starting git daemon (standard)..."
+	GIT_STANDARD_DIR=`mktemp -d ${TMPDIR}/git_standard.XXXXXXXX`
+	git init --bare "${GIT_STANDARD_DIR}/test.git" >/dev/null
+	git daemon --listen=localhost --export-all --enable=receive-pack --base-path="${GIT_STANDARD_DIR}" "${GIT_STANDARD_DIR}" 2>/dev/null &
+	GIT_STANDARD_PID=$!
+
+	echo "Starting git daemon (namespace)..."
+	GIT_NAMESPACE_DIR=`mktemp -d ${TMPDIR}/git_namespace.XXXXXXXX`
+	cp -R "${SOURCE_DIR}/tests/resources/namespace.git" "${GIT_NAMESPACE_DIR}/namespace.git"
+	GIT_NAMESPACE="name1" git daemon --listen=localhost --port=9419 --export-all --enable=receive-pack --base-path="${GIT_NAMESPACE_DIR}" "${GIT_NAMESPACE_DIR}" &
+	GIT_NAMESPACE_PID=$!
 fi
 
 if [ -z "$SKIP_PROXY_TESTS" ]; then
 	curl --location --silent --show-error https://github.com/ethomson/poxyproxy/releases/download/v0.7.0/poxyproxy-0.7.0.jar >poxyproxy.jar
 
-	echo ""
 	echo "Starting HTTP proxy (Basic)..."
 	java -jar poxyproxy.jar --address 127.0.0.1 --port 8080 --credentials foo:bar --auth-type basic --quiet &
+	PROXY_BASIC_PID=$!
 
-	echo ""
 	echo "Starting HTTP proxy (NTLM)..."
 	java -jar poxyproxy.jar --address 127.0.0.1 --port 8090 --credentials foo:bar --auth-type ntlm --quiet &
+	PROXY_NTLM_PID=$!
 fi
 
 if [ -z "$SKIP_NTLM_TESTS" -o -z "$SKIP_ONLINE_TESTS" ]; then
 	curl --location --silent --show-error https://github.com/ethomson/poxygit/releases/download/v0.5.1/poxygit-0.5.1.jar >poxygit.jar
 
-	echo ""
 	echo "Starting HTTP server..."
-	NTLM_DIR=`mktemp -d ${TMPDIR}/ntlm.XXXXXXXX`
-	git init --bare "${NTLM_DIR}/test.git"
-	java -jar poxygit.jar --address 127.0.0.1 --port 9000 --credentials foo:baz --quiet "${NTLM_DIR}" &
+	HTTP_DIR=`mktemp -d ${TMPDIR}/http.XXXXXXXX`
+	git init --bare "${HTTP_DIR}/test.git"
+	java -jar poxygit.jar --address 127.0.0.1 --port 9000 --credentials foo:baz --quiet "${HTTP_DIR}" &
+	HTTP_PID=$!
 fi
 
 if [ -z "$SKIP_SSH_TESTS" ]; then
-	echo ""
-	echo "Starting ssh daemon..."
+	echo "Starting SSH server..."
 	HOME=`mktemp -d ${TMPDIR}/home.XXXXXXXX`
 	SSHD_DIR=`mktemp -d ${TMPDIR}/sshd.XXXXXXXX`
 	git init --bare "${SSHD_DIR}/test.git" >/dev/null
@@ -144,6 +170,11 @@ if [ -z "$SKIP_SSH_TESTS" ]; then
 		echo "[localhost]:2222 $algorithm $key" >>"${HOME}/.ssh/known_hosts"
 	done <"${SSHD_DIR}/id_rsa.pub"
 
+	# Append the github.com keys for the tests that don't override checks.
+	# We ask for ssh-rsa to test that the selection based off of known_hosts
+	# is working.
+	ssh-keyscan -t ssh-rsa github.com >>"${HOME}/.ssh/known_hosts"
+
 	# Get the fingerprint for localhost and remove the colons so we can
 	# parse it as a hex number. Older versions have a different output
 	# format.
@@ -214,12 +245,22 @@ fi
 
 if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
 	echo ""
-	echo "Running gitdaemon tests"
+	echo "Running gitdaemon (standard) tests"
 	echo ""
 
 	export GITTEST_REMOTE_URL="git://localhost/test.git"
 	run_test gitdaemon
 	unset GITTEST_REMOTE_URL
+
+	echo ""
+	echo "Running gitdaemon (namespace) tests"
+	echo ""
+
+	export GITTEST_REMOTE_URL="git://localhost:9419/namespace.git"
+	export GITTEST_REMOTE_BRANCH="four"
+	run_test gitdaemon_namespace
+	unset GITTEST_REMOTE_URL
+	unset GITTEST_REMOTE_BRANCH
 fi
 
 if [ -z "$SKIP_PROXY_TESTS" ]; then

cmake/ExperimentalFeatures.cmake

@@ -1,8 +1,19 @@
+# Experimental feature support for libgit2 - developers can opt in to
+# experimental functionality, like sha256 support. When experimental
+# functionality is enabled, we set both a cmake flag *and* a compile
+# definition. The cmake flag is used to generate `experimental.h`,
+# which will be installed by a `make install`. But the compile definition
+# is used by the libgit2 sources to detect the functionality at library
+# build time. This allows us to have an in-tree `experimental.h` with
+# *no* experiments enabled. This lets us support users who build without
+# cmake and cannot generate the `experimental.h` file.
+
 if(EXPERIMENTAL_SHA256)
 	add_feature_info("SHA256 API" ON "experimental SHA256 APIs")
 
 	set(EXPERIMENTAL 1)
 	set(GIT_EXPERIMENTAL_SHA256 1)
+	add_compile_definitions(GIT_EXPERIMENTAL_SHA256)
 else()
 	add_feature_info("SHA256 API" OFF "experimental SHA256 APIs")
 endif()

include/git2/experimental.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_experimental_h__
+#define INCLUDE_experimental_h__
+
+/*
+ * This file exists to support users who build libgit2 with a bespoke
+ * build system and do not use our cmake configuration. Normally, cmake
+ * will create `experimental.h` from the `experimental.h.in` file and
+ * will include the generated file instead of this one. For non-cmake
+ * users, we bundle this `experimental.h` file which will be used
+ * instead.
+ */
+
+#endif

src/cli/opt.c

@@ -23,7 +23,7 @@
 #include "opt.h"
 
 #ifdef _WIN32
-# include <Windows.h>
+# include <windows.h>
 #else
 # include <fcntl.h>
 # include <sys/ioctl.h>

src/libgit2/clone.c

@@ -282,7 +282,11 @@ static int update_head_to_branch(
 			reflog_message)) < 0)
 		goto cleanup;
 
-	if ((retcode = git_remote__default_branch(&default_branch, remote)) < 0)
+	retcode = git_remote__default_branch(&default_branch, remote);
+
+	if (retcode == GIT_ENOTFOUND)
+		retcode = 0;
+	else if (retcode)
 		goto cleanup;
 
 	if (!git_remote__matching_refspec(remote, git_str_cstr(&default_branch)))