|
1073061e
|
2015-10-22T09:29:40
|
|
index: test that we round-trip nsecs
Test that nanoseconds are round-tripped correctly when we read
an index file that contains them. We should, however, ignore them
because we don't understand them, and any new entries in the index
should contain a `0` nsecs field, while existing preserving entries.
|
|
5e261420
|
2015-10-22T07:56:34
|
|
inttypes.h is built-in header file since MSVC 2013
The reason is that the types defined in libgit2's inttypes.h collide with system inttypes.h
3rd party library header files may directly reference MSVC's built-in inttypes.h
Fixes #3476
|
|
|
afed770e
|
2015-10-21T09:24:10
|
|
win32: add c linkage guard around inttypes.h inclusion
|
|
abdbfefb
|
2015-10-21T11:58:44
|
|
signature: Strip crud just like Git does
|
|
|
aef97245
|
2015-10-14T19:31:54
|
|
odb: Prioritize alternate backends
For most real use cases, repositories with alternates use them as main
object storage. Checking the alternate for objects before the main
repository should result in measurable speedups.
Because of this, we're changing the sorting algorithm to prioritize
alternates *in cases where two backends have the same priority*. This
means that the pack backend for the alternate will be checked before the
pack backend for the main repository *but* both of them will be checked
before any loose backends.
|
|
|
18ff20f8
|
2015-10-14T19:24:07
|
|
odb: Be smarter when refreshing backends
In the current implementation of ODB backends, each backend is tasked
with refreshing itself after a failed lookup. This is standard Git
behavior: we want to e.g. reload the packfiles on disk in case they have
changed and that's the reason we can't find the object we're looking
for.
This behavior, however, becomes pathological in repositories where
multiple alternates have been loaded. Given that each alternate counts
as a separate backend, a miss in the main repository (which can
potentially be very frequent in cases where object storage comes from
the alternate) will result in refreshing all its packfiles before we
move on to the alternate backend where the object will most likely be
found.
To fix this, the code in `odb.c` has been refactored as to perform the
refresh of all the backends externally, once we've verified that the
object is nowhere to be found.
If the refresh is successful, we then perform the lookup sequentially
through all the backends, skipping the ones that we know for sure
weren't refreshed (because they have no refresh API).
The on-disk pack backend has been adjusted accordingly: it no longer
performs refreshes internally.
|
|
486270dc
|
2015-10-14T16:49:01
|
|
revwalk: make commit list use 64 bits for time
We moved the "main" parsing to use 64 bits for the timestamp, but the
quick parsing for the revwalk did not. This means that for large
timestamps we fail to parse the time and thus the walk.
Move this parser to use 64 bits as well.
|
|
|
47e4b74a
|
2015-10-06T13:35:45
|
|
CMake: be more explicit with python errors
There's been a few reports of users not understanding what the python
error means, so spell out the options they have.
|
|
|
66956c50
|
2015-09-30T05:49:04
|
|
qsort_r/qsort_s: detect their support
|
|
|
cd768280
|
2015-09-29T13:36:37
|
|
p_futimes: support using futimens when available
|
|
|
08a2a939
|
2015-09-30T09:41:25
|
|
openssl: don't try to teardown an unconnected SSL context
SSL_shutdown() does not like it when we pass an unitialized ssl context
to it. This means that when we fail to connect to a host, we hide the
error message saying so with OpenSSL's indecipherable error message.
|
|
|
7dd51284
|
2015-09-28T16:46:09
|
|
win32::longpath: don't print path
|
|
6aed945f
|
2015-09-25T10:37:41
|
|
Fix binary diffs
git expects an empty line after the binary data:
literal X
...binary data...
<empty_line>
The last literal block of the generated patches were not containing the required empty line. Example:
diff --git a/binary_file b/binary_file
index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 6
Nc${NM%g@i}0ssZ|0lokL
diff --git a/binary_file2 b/binary_file2
index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 13
Sc${NMEKbZyOexL+Qd|HZV+4u-
git apply of that diff results in:
error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2
fatal: patch with only garbage at line 10
The proper formating is:
diff --git a/binary_file b/binary_file
index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 6
Nc${NM%g@i}0ssZ|0lokL
diff --git a/binary_file2 b/binary_file2
index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
GIT binary patch
literal 8
Pc${NM&PdElPvrst3ey5{
literal 13
Sc${NMEKbZyOexL+Qd|HZV+4u-
|
|
|
1a1d5758
|
2015-09-22T23:24:30
|
|
win32: test checkout msg on long path err
|
|
|
80b4536b
|
2015-09-22T23:10:56
|
|
win32: propogate filename too long errors
|
|
1ffa0739
|
2015-09-17T18:12:05
|
|
repository: only reserve repo dirs in the workdir
Check that the repository directory is beneath the workdir before
adding it to the list of reserved paths. If it is not, then there
is no possibility of checking out files into it, and it should not
be a reserved word.
This is a particular problem with submodules where the repo directory
may be in the super's .git directory.
|
|
1568dea8
|
2015-09-10T16:11:10
|
|
pkg-config: fix directory references in libgit2.pc
Before:
libdir=/usr//usr/lib64
includedir=/usr//usr/include
After:
libdir=/usr/lib64
includedir=/usr/include
(note the duplication of /usr in the before case)
|
|
|
ad8e8fa7
|
2015-09-17T12:23:19
|
|
win32: return EACCES in `p_lstat`
Don't coalesce all errors into ENOENT. At least identify EACCES.
All callers should be handling this case already, as the POSIX
`lstat` will return this.
|
|
|
59ac2242
|
2015-09-16T05:44:27
|
|
checkout: overwrite files with differing modes
When a file exists on disk and we're checking out a file that differs
in executableness, remove the old file. This allows us to recreate the
new file with p_open, which will take the new mode into account and
handle setting the umask properly.
Remove any notion of chmod'ing existing files, since it is now handled
by the aforementioned removal and was incorrect, as it did not take
umask into account.
|
|
|
097c5bc7
|
2015-09-16T10:17:54
|
|
checkout::tree tests: don't use hardcoded mode
|
|
|
d73bf243
|
2015-09-16T04:12:47
|
|
checkout::tree tests: don't use static buffer
|
|
9ae94bcc
|
2015-06-01T14:31:49
|
|
Check that checkout preserves filemode in working directory.
|
|
|
92471142
|
2015-06-01T11:16:36
|
|
Check that an executable in index is not an executable after checkout.
|
|
d1a7d0e1
|
2015-09-11T16:35:14
|
|
Removing memory leak in mempack's free
It calls git_mempack_reset which reallocates the object array. git_oidmap_free is now called on it explicitly.
|
|
|
7e53d83c
|
2015-09-10T14:44:52
|
|
Fixing dangling pointers in git_mempack_reset
git_mempack_reset was leaving free'd pointers in the oidmap.
|
|
d960fb32
|
2015-08-14T15:42:59
|
|
added a single line of additional error reporting from libssh2 when failing to retrieve the list of authentication methods
|
|
|
c1dabd18
|
2015-09-05T03:54:06
|
|
filebuf: follow symlinks when creating a lock file
We create a lockfile to update files under GIT_DIR. Sometimes these
files are actually located elsewhere and a symlink takes their place. In
that case we should lock and update the file at its final location
rather than overwrite the symlink.
|
|
|
fe965028
|
2015-10-05T23:37:22
|
|
Merge pull request #3452 from ethomson/0.23_xdiff
0.23 xdiff
|
|
|
bf70c359
|
2015-10-01T10:07:33
|
|
Update version to 0.23.3
|
|
|
683af196
|
2015-09-29T12:46:41
|
|
blame: guard xdiff calls for large files
|
|
|
7eb26267
|
2015-09-28T18:25:24
|
|
merge_file: treat large files as binary
xdiff craps the bed on large files. Treat very large files as binary,
so that it doesn't even have to try.
Refactor our merge binary handling to better match git.git, which
looks for a NUL in the first 8000 bytes.
|
|
|
61c6f441
|
2015-09-29T12:18:17
|
|
diff: don't feed large files to xdiff
|
|
|
5045868a
|
2015-09-28T16:34:29
|
|
xdiff: convert size variables to size_t
|
|
|
f362a1b1
|
2015-09-28T16:24:50
|
|
GITERR_CHECK_ALLOC_ADDn: multi-arg adders
|
|
|
2de198b4
|
2015-09-05T16:48:42
|
|
Bump version to 0.23.2
|
|
|
c7122033
|
2015-09-03T11:43:48
|
|
Merge pull request #3409 from libgit2/update-v23
Maintenance backports for v23
|
|
|
bad51c51
|
2015-09-03T11:38:21
|
|
config: correct documentation for non-existent config file
|
|
ac1c1575
|
2015-08-29T17:46:34
|
|
Escape @ in doc comment
|
|
|
a6a9cf04
|
2015-08-25T11:20:37
|
|
COPYING: include winhttp definition copyright
Include the copyright notice from the deps/winhttp/ sources. Move the
LGPL to the bottom of the file (since multiple dependencies are LGPL
licensed) and include the actual copyright notices from the regex sources.
|
|
|
1b000610
|
2015-08-19T12:53:31
|
|
CMake: fall back to OpenSSL on older OS X
Starting at OS X 10.8, the Security framework offers some functions
which are unified across OS X and iOS. These are the functions that we
use.
Older versions of OS X do not have these functions and we fail to
compile. In these situations, fall back to using OpenSSL for our TLS
stream instead.
|
|
|
c2549eea
|
2015-08-15T18:46:38
|
|
diff: don't error out on an invalid regex
When parsing user-provided regex patterns for functions, we must not
fail to provide a diff just because a pattern is not well
formed. Ignore it instead.
|
|
|
d994cfc8
|
2015-08-15T18:15:23
|
|
http: propagate the credentials callback's error code
When we ask for credentials, the user may choose to return EUSER to
indicate that an error has happened on its end and it wants to be given
back control.
We must therefore pass that back to the user instead of mentioning that
it was on_headers_complete() that returned an error code. Since we can,
we return the exact error code from the user (other than PASSTHROUGH)
since it doesn't cost anything, though using other error codes aren't
recommended.
|
|
5470fd6d
|
2015-08-13T22:52:52
|
|
Fix bug in git_smart__push: push_transfer_progress cb is never called
The conditional checked cbs->transfer_progress then used the value in cbs->push_transfer_progress. In both cases it should be push_transfer_progress
|
|
|
7a215040
|
2015-08-11T22:51:53
|
|
remote: don't confuse tag auto-follow rules with refspec matching
When we're looking to update a tag, we can't stop if the tag auto-follow
rules don't say to update it. The tag might still match the refspec we
were given.
|
|
|
40abdc65
|
2015-08-06T13:02:35
|
|
curl: use the most secure auth method for the proxy
When curl uses a proxy, it will only use Basic unless we prompt it to
try to use the most secure on it has available.
This is something which git did recently, and it seems like a good idea.
|
|
9f334ba3
|
2015-08-06T11:06:17
|
|
Forcing libssh2 lib location
OS X may have libssh2 in diff locations, so CHECK_LIBRARY_EXISTS may check the wrong lib; forcing it to use a found directory.
|
|
|
d72914db
|
2015-08-05T16:27:47
|
|
Merge pull request #3359 from nodegit/maint/v0.23-duplicate-basename-fix
Fix duplicate basenames to support older VS on maint/v0.23
|
|
2cb4b653
|
2015-08-05T10:19:06
|
|
Fix duplicate basenames to support older VS
With Visual Studio versions 2008 and older they ignore the full path to files and only check
the basename of the file to find a collision. Additionally, having duplicate basenames can break
other build tools like GYP.
This fixes https://github.com/libgit2/libgit2/issues/3356
|
|
|
f6dedf2c
|
2015-08-03T20:07:35
|
|
Bump version to v0.23.1
|
|
|
5915a2a2
|
2015-08-03T19:25:03
|
|
Merge pull request #3349 from libgit2/cmn/for-v23
A second round of 0.23 maint updates
|
|
|
16cee5d6
|
2015-08-03T08:17:47
|
|
Stage an unregistered submodule in _add_bypath()
|
|
|
62a273cc
|
2015-07-24T19:22:41
|
|
filebuf: remove lockfile upon rename errors
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.
|
|
|
adb8f8d0
|
2015-07-24T18:44:29
|
|
filebuf: failing test for leaving the lockfile when failing to rename
When we fail to rename, we currently leave the lockfile laying
around. This shows that behaviour.
|
|
e874f3c1
|
2015-07-05T10:07:48
|
|
Increase required version of cmake to 2.8
|
|
7483e08f
|
2015-08-03T07:38:07
|
|
Handle ssh:// and git:// urls containing a '~' character.
For such a path '/~/...' the leading '/' is stripped so the server will
get a path starting with '~' and correctly handle it.
|
|
a299d0af
|
2015-07-31T16:23:11
|
|
Remove extra semicolon outside of a function
Without this change, compiling with gcc and pedantic generates warning:
ISO C does not allow extra ‘;’ outside of a function.
|
|
|
e5a77249
|
2015-08-01T15:38:04
|
|
Cherry-pick PR #3332: Resolve documentation warnings
|
|
a91dff89
|
2015-07-29T22:23:00
|
|
case-insensitive check for WWW-Authenticate header
Fixes issue #3338
|
|
|
c5d43178
|
2015-07-27T13:31:06
|
|
iterator: adjust unreadable-dir test to new behaviour
We don't want the iterator to make us stop whenever we hit an unreadable
dir. We should instead move over to the next item.
|
|
|
a4ded362
|
2015-07-26T17:19:22
|
|
iterator: skip over errors in diriter init
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.
|
|
|
6a0d5696
|
2015-08-01T15:37:04
|
|
Merge pull request #3333 from libgit2/cmn/for-v23
Maintenance updates for v0.23
|
|
ac1a5e20
|
2015-07-21T23:36:39
|
|
Make libgit2 work on Windows Vista again
(fixes issue #3316)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
555b3518
|
2015-07-20T09:21:36
|
|
Document git_fetch_options struct and fix typo.
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).
|
|
2563101b
|
2015-07-14T15:33:56
|
|
Fix macro redefinition warning
|
|
|
55bc1351
|
2015-07-13T09:08:32
|
|
submodule: normalize slashes in resolve_url
Our path functions expect to work with slashes, so convert a
path with backslashes into one with slashes at the top of
the function.
|
|
|
a89a756d
|
2015-07-13T08:39:35
|
|
submodule: add failing test for backslash in url
|
|
38dc9940
|
2015-06-30T19:00:41
|
|
Fix #3094 - improve use of portable size_t/ssize_t format specifiers.
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.
|
|
|
34ff34fd
|
2015-07-12T13:28:03
|
|
filter: make sure to close the stream even on error
When the stream list init or write fail, we must also make sure to close
the stream, as that's the function contract.
|
|
|
678c4aac
|
2015-07-11T19:41:03
|
|
index: allow add_bypath to update submodules
Similarly to how git itself does it, allow the index update operation to
stage a change in a submodule's HEAD.
|
|
|
aafaa491
|
2015-07-11T19:03:38
|
|
blob: fail to create a blob from a dir with EDIRECTORY
This also affects `git_index_add_bypath()` by providing a better error
message and a specific error code when a directory is passed.
|
|
|
7624b91f
|
2015-07-11T18:51:36
|
|
errors: add EDIRECTORY
This is to be returned when the operation which the user asked for is
not possible to do on a directory.
|
|
|
e48dd86e
|
2015-07-11T18:31:28
|
|
submodule: lookup the submodule by path if available
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.
|
|
|
1207b8f2
|
2015-07-11T13:32:57
|
|
submdule: reproduce double-reporting of a submodule in foreach
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.
|
|
|
f2dc6b77
|
2015-06-30T13:41:01
|
|
khash: add eol so picky compilers stop warning
|
|
|
a4743de8
|
2015-07-10T09:21:59
|
|
xdiff: cleanup some warnings
|
|
|
75d0b81a
|
2015-07-07T16:46:48
|
|
xdiff: upgrade to core git 2.4.5
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).
|
|
|
ba6b2884
|
2015-07-07T16:46:20
|
|
revert: correct test that added trailing newline
|
|
|
9ff89eaa
|
2015-07-07T16:59:14
|
|
merge_files: don't add trailing newlines
When invoked with three files that each lack a trailing newline,
the merge result should also lack a trailing newline.
|
|
|
f5740391
|
2015-07-07T06:55:05
|
|
Fix undefined reference with old versions of openssl
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
```
|
|
|
159061a8
|
2015-07-06T16:23:44
|
|
Update CHANGELOG with the release number
|
|
|
4d6362b1
|
2015-07-03T16:29:32
|
|
Merge pull request #3290 from libgit2/cmn/filter-doc
filter: add docs for streaming filters
|
|
|
a94d3e68
|
2015-07-03T14:34:30
|
|
filter: add docs for streaming filters
These functions are available on the public API but don't have any
documentation, so they don't appear on the API reference. Fix that.
|
|
|
99090a85
|
2015-07-03T00:38:33
|
|
Merge pull request #3289 from ethomson/warnings4
iterator_walk: cast away constness for free
|
|
|
f034c851
|
2015-07-02T17:55:16
|
|
Merge pull request #3287 from ethomson/filter_test_cleanup
filter::stream: free the filter sanely
|
|
|
dd6b24b1
|
2015-07-02T10:36:15
|
|
iterator_walk: cast away constness for free
|
|
|
79306d8d
|
2015-07-02T10:18:40
|
|
filter::stream: free the filter sanely
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).
|
|
|
eb94199f
|
2015-07-02T08:35:05
|
|
Merge pull request #3286 from libgit2/cmn/submodule-duplicate
Correctly delimit the keys for submodule lookup
|
|
|
e0af3cb3
|
2015-07-01T21:15:06
|
|
submodule: correctly delimit the keys to use for lookup
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.
|
|
|
e8e848a8
|
2015-07-01T21:10:40
|
|
submodule: add failing test for loading the wrong submodule
When two submodules are fairly similar, we may end up loading the wrong
one.
|
|
|
bf7d2761
|
2015-07-01T12:02:27
|
|
Merge pull request #3280 from linquize/8.3
Fix 8.3 filename tests failure when 8.3 is disabled
|
|
|
34065968
|
2015-07-01T17:49:07
|
|
submodule: completely remove reload_all
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.
|
|
|
526f91f5
|
2015-07-01T14:58:13
|
|
Fix 8.3 filename tests failure when 8.3 is disabled
|
|
|
aa92c318
|
2015-06-30T17:38:22
|
|
Merge pull request #3278 from mplough/master
Fix #3093 - remove declaration of unused function git_fetch__download…
|
|
|
9126ccac
|
2015-06-30T16:48:47
|
|
Fix #3093 - remove declaration of unused function git_fetch__download_pack
Function was added in commit 2c982daa2eec64b80c7940bfe1142295bd72edd8 on October 5, 2011,
and removed in commit 41fb1ca0ec51ad1d2a14b911aab3215e42965d1b on October 29, 2012.
Given the length of time it's gone unused, it's safe to remove now.
|
|
|
2f60073d
|
2015-06-30T21:40:20
|
|
Merge pull request #3273 from ethomson/warnings3
More warnings
|
|
|
cb58fb24
|
2015-06-30T13:39:07
|
|
Merge pull request #3275 from git-up/http_fix
http: fixed leak when asking for credentials again
|
|
1630981e
|
2015-06-30T09:03:23
|
|
http: fixed leak when asking for credentials again
t->cred might have been allocated the previous time and needs to be
freed before asking caller for credentials again.
|
|
|
eb29292a
|
2015-06-30T14:25:51
|
|
index tests: add eol to avoid compiler warning
|
|
|
504b0697
|
2015-06-30T14:25:00
|
|
checkout test: mark unused vars
|
|
|
0305721c
|
2015-06-30T14:23:41
|
|
winhttp: remove unused var
|