-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJVyJsAAAoJEKPQMr0n6UoaHEIIAILDoUvGOpVEqKyemeQ+lKAz
hElVNcQzjSmjb4BbXbvGadtSkknqljjwrpKcRkrBam5SfetF0xkEMqhCVUHPHt+G
OwOCm1EStToL7iCpDfUHwFp5kZPkmWo8bLBv1SWLHVPbgZpqLxfpYH2nBKX8NeQU
a0OVEz0pGpV+q5NT9tEEtvAx1MvDmLngkbz70e+1Rjzr4ZM/mQoxJ2KenVmkwnkx
w3YyDVZv7tKGtN1UAbjhpFMdX8JR3lAtZLccs66mpPAnlZle/DZVnBk5QyijVQC6
+AjkGWAQUIjD4ZkuQ3jlflhKCK+//rx45LFM8KAlhg1PWALFJfWyKm/xZ1I0GpE=
=Z7Zv
-----END PGP SIGNATURE-----
Merge tag 'upstream/0.23.1'
Updated to 0.23.1
* tag 'upstream/0.23.1': (29 commits)
Bump version to v0.23.1
Stage an unregistered submodule in _add_bypath()
filebuf: remove lockfile upon rename errors
filebuf: failing test for leaving the lockfile when failing to rename
Increase required version of cmake to 2.8
Handle ssh:// and git:// urls containing a '~' character.
Remove extra semicolon outside of a function
Cherry-pick PR #3332: Resolve documentation warnings
case-insensitive check for WWW-Authenticate header
iterator: adjust unreadable-dir test to new behaviour
iterator: skip over errors in diriter init
Make libgit2 work on Windows Vista again
Document git_fetch_options struct and fix typo.
Fix macro redefinition warning
submodule: normalize slashes in resolve_url
submodule: add failing test for backslash in url
Fix#3094 - improve use of portable size_t/ssize_t format specifiers.
filter: make sure to close the stream even on error
index: allow add_bypath to update submodules
blob: fail to create a blob from a dir with EDIRECTORY
...
When we have an error renaming the lockfile, we need to make sure
that we remove it upon cleanup. For this, we need to keep track of
whether we opened the file and whether the rename succeeded.
If we did create the lockfile but the rename did not succeed, we
remove the lockfile. This won't protect against all errors, but
the most common ones (target file is open) does get handled.
An error here will typically mean that the directory was removed between
the time we iterated the parent and the time we wanted to visit it in
which case we should ignore it.
Other kinds of errors such as permissions (or transient errors) also
better dealt with by pretending we didn't see it.
git_fetch_options was missing from the API docs because it lacked a
documentation comment above the struct declaration.
I used the git_checkout_options docstring as a template.
Also fixes a typo in git_remote_prune_refs (remote, not reamote).
The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
If we get the path from the gitmodules file, look up the submodule we're
interested in by path, rather then by name. Otherwise we might get
duplicate results.
When we rename a submodule, we should be merging two sets of information
based on whether their path is the same. We currently only deduplicate
on equal name, which causes us to double-report.
Upgrade xdiff to version used in core git 2.4.5 (0df0541).
Corrects an issue where an LF is added at EOF while applying
an unrelated change (ba31180), cleans up some unused code (be89977 and
e5b0662), and provides an improved callback to avoid leaking internal
(to xdiff) structures (467d348).
This also adds some additional functionality that we do not yet take
advantage of, namely the ability to ignore changes whose lines are
all blank (36617af).
Versions prior to 0.9.8f did not have this function, rhel/centos5 are still on a
heavily backported version of 0.9.8e and theoretically supported until March 2017
Without this ifdef, I get the following link failure:
```
CMakeFiles/libgit2_clar.dir/src/openssl_stream.c.o: In function `openssl_connect':
openssl_stream.c:(.text+0x45a): undefined reference to `SSL_set_tlsext_host_name'
collect2: error: ld returned 1 exit status
make[6]: *** [libgit2_clar] Error 1
```
* upstream: (1173 commits)
Update CHANGELOG with the release number
filter: add docs for streaming filters
iterator_walk: cast away constness for free
filter::stream: free the filter sanely
submodule: correctly delimit the keys to use for lookup
submodule: add failing test for loading the wrong submodule
submodule: completely remove reload_all
Fix 8.3 filename tests failure when 8.3 is disabled
Fix#3093 - remove declaration of unused function git_fetch__download_pack
http: fixed leak when asking for credentials again
index tests: add eol to avoid compiler warning
checkout test: mark unused vars
winhttp: remove unused var
posix compat: include sys/stat.h for mingw
diff: use size_t format
fix memory leak in refspec.c on errors.
checkout test: check getcwd return value
clar: test chdir
filter test: pass base type
examples: clean up some warnings
...
Don't use the filter's free callback to free the actual data structure
holding the filter, as we may not always actually initialize it (the
test may be skipped).
The regex we use to look at the gitmodules file does not correctly
delimit the name of submodule which we want to look up and puts '.*'
straight after the name, maching on any submodule which has the seeked
submodule as a prefix of its name.
Add the missing '\.' in the regex so we want a full stop to exist both
before and after the submodule name.
The function was removed, but its declaration and changelog entry about
its removal were forgotten.
The comment in the test doesn't make any sense as the function doesn't
exist anymore, so get rid of it as well.
