Log

Author Commit Date CI Message
Edward Thomson 097c5bc7 2015-09-16T10:17:54 checkout::tree tests: don't use hardcoded mode
Edward Thomson d73bf243 2015-09-16T04:12:47 checkout::tree tests: don't use static buffer
Matti Virolainen 92471142 2015-06-01T11:16:36 Check that an executable in index is not an executable after checkout.
Matti Virolainen 9ae94bcc 2015-06-01T14:31:49 Check that checkout preserves filemode in working directory.
Bryan Woods 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.
Bryan Woods 7e53d83c 2015-09-10T14:44:52 Fixing dangling pointers in git_mempack_reset git_mempack_reset was leaving free'd pointers in the oidmap.
Max Leske 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
Carlos Martín Nieto 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.
Edward Thomson fe965028 2015-10-05T23:37:22 Merge pull request #3452 from ethomson/0.23_xdiff 0.23 xdiff
Edward Thomson bf70c359 2015-10-01T10:07:33 Update version to 0.23.3
Edward Thomson 683af196 2015-09-29T12:46:41 blame: guard xdiff calls for large files
Edward Thomson 61c6f441 2015-09-29T12:18:17 diff: don't feed large files to xdiff
Edward Thomson 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.
Edward Thomson 5045868a 2015-09-28T16:34:29 xdiff: convert size variables to size_t
Edward Thomson f362a1b1 2015-09-28T16:24:50 GITERR_CHECK_ALLOC_ADDn: multi-arg adders
Carlos Martín Nieto 2de198b4 2015-09-05T16:48:42 Bump version to 0.23.2
Edward Thomson c7122033 2015-09-03T11:43:48 Merge pull request #3409 from libgit2/update-v23 Maintenance backports for v23
Carlos Martín Nieto bad51c51 2015-09-03T11:38:21 config: correct documentation for non-existent config file
Ben Chatelain ac1c1575 2015-08-29T17:46:34 Escape @ in doc comment
Edward Thomson 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Dan Leehr 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
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Slava Karpenko 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.
Edward Thomson 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
John Haley 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
Carlos Martín Nieto f6dedf2c 2015-08-03T20:07:35 Bump version to v0.23.1
Carlos Martín Nieto 5915a2a2 2015-08-03T19:25:03 Merge pull request #3349 from libgit2/cmn/for-v23 A second round of 0.23 maint updates
Edward Thomson 16cee5d6 2015-08-03T08:17:47 Stage an unregistered submodule in _add_bypath()
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Tony Kelman e874f3c1 2015-07-05T10:07:48 Increase required version of cmake to 2.8
Simon 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.
Stefan Widgren 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.
Carlos Martín Nieto e5a77249 2015-08-01T15:38:04 Cherry-pick PR #3332: Resolve documentation warnings
Anders Borum a91dff89 2015-07-29T22:23:00 case-insensitive check for WWW-Authenticate header Fixes issue #3338
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 6a0d5696 2015-08-01T15:37:04 Merge pull request #3333 from libgit2/cmn/for-v23 Maintenance updates for v0.23
Sven Strickroth 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>
Ryan Roden-Corrent 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).
Fallso 2563101b 2015-07-14T15:33:56 Fix macro redefinition warning
Carlos Martín Nieto 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.
Carlos Martín Nieto a89a756d 2015-07-13T08:39:35 submodule: add failing test for backslash in url
Matthew Plough 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Edward Thomson f2dc6b77 2015-06-30T13:41:01 khash: add eol so picky compilers stop warning
Edward Thomson a4743de8 2015-07-10T09:21:59 xdiff: cleanup some warnings
Edward Thomson 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).
Edward Thomson ba6b2884 2015-07-07T16:46:20 revert: correct test that added trailing newline
Edward Thomson 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.
Tony Kelman 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 ```
Carlos Martín Nieto 159061a8 2015-07-06T16:23:44 Update CHANGELOG with the release number
Carlos Martín Nieto 4d6362b1 2015-07-03T16:29:32 Merge pull request #3290 from libgit2/cmn/filter-doc filter: add docs for streaming filters
Carlos Martín Nieto 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.
Carlos Martín Nieto 99090a85 2015-07-03T00:38:33 Merge pull request #3289 from ethomson/warnings4 iterator_walk: cast away constness for free
Carlos Martín Nieto f034c851 2015-07-02T17:55:16 Merge pull request #3287 from ethomson/filter_test_cleanup filter::stream: free the filter sanely
Edward Thomson dd6b24b1 2015-07-02T10:36:15 iterator_walk: cast away constness for free
Edward Thomson 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).
Carlos Martín Nieto eb94199f 2015-07-02T08:35:05 Merge pull request #3286 from libgit2/cmn/submodule-duplicate Correctly delimit the keys for submodule lookup
Carlos Martín Nieto 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.
Carlos Martín Nieto 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.
Edward Thomson 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
Carlos Martín Nieto 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.
Linquize 526f91f5 2015-07-01T14:58:13 Fix 8.3 filename tests failure when 8.3 is disabled
Edward Thomson aa92c318 2015-06-30T17:38:22 Merge pull request #3278 from mplough/master Fix #3093 - remove declaration of unused function git_fetch__download…
Matthew Plough 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.
Carlos Martín Nieto 2f60073d 2015-06-30T21:40:20 Merge pull request #3273 from ethomson/warnings3 More warnings
Edward Thomson cb58fb24 2015-06-30T13:39:07 Merge pull request #3275 from git-up/http_fix http: fixed leak when asking for credentials again
Pierre-Olivier Latour 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.
Edward Thomson eb29292a 2015-06-30T14:25:51 index tests: add eol to avoid compiler warning
Edward Thomson 504b0697 2015-06-30T14:25:00 checkout test: mark unused vars
Edward Thomson 0305721c 2015-06-30T14:23:41 winhttp: remove unused var
Edward Thomson 69c8bf7e 2015-06-30T14:21:29 posix compat: include sys/stat.h for mingw
Edward Thomson 49840056 2015-06-30T14:20:31 diff: use size_t format
Edward Thomson 3451c871 2015-06-30T09:29:41 Merge pull request #3271 from jeffhostetler/more_leaks memory leak refspec.c
Jeff Hostetler 64e6b5b0 2015-06-29T17:32:22 fix memory leak in refspec.c on errors.
Carlos Martín Nieto 7bfdd1c2 2015-06-30T10:21:06 Merge pull request #3270 from ethomson/warnings2 Remove some warnings
Edward Thomson 64c415c2 2015-06-29T22:12:20 checkout test: check getcwd return value
Edward Thomson eadf3715 2015-06-29T22:10:45 clar: test chdir
Edward Thomson d88abb89 2015-06-29T21:54:06 filter test: pass base type
Edward Thomson d202bb7d 2015-06-29T21:48:35 examples: clean up some warnings
Edward Thomson e5f9df7b 2015-06-29T21:45:04 odb: cast to long long for printf
Edward Thomson 60655056 2015-06-29T21:37:07 submodule: cast enum to int for compare
Edward Thomson 3ca84ac0 2015-06-29T20:29:29 openssl: free hostname
Edward Thomson 0175971e 2015-06-29T15:21:22 stash: const up conflict params
Edward Thomson 2cf33fee 2015-06-29T15:20:34 index test: include repository.h for decl
Edward Thomson 149d5d8a 2015-06-29T15:17:58 stash: drop unused variable
Edward Thomson ded4ccab 2015-06-29T15:16:22 iterator_walk: drop unused variable
Edward Thomson 4a0313bc 2015-06-29T15:22:47 Merge pull request #3269 from libgit2/cmn/release-fixups Submodule and http fixes
Carlos Martín Nieto 8b380060 2015-06-29T21:12:44 http: don't give up on auth on the first try When the server rejects an authentication request, ask the caller for the credentials again, instead of giving up on the first try.
Carlos Martín Nieto c28a5c97 2015-06-29T21:10:47 submodule: remove trailing slashes from submodule paths We allow looking up a submodule by path, but we lost the path normalisation during the recent changes. Bring it back.