summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* config: correct documentation for non-existent config fileupdate-v23Carlos Martín Nieto2015-09-031-2/+4
|
* Escape @ in doc commentBen Chatelain2015-09-031-1/+1
|
* COPYING: include winhttp definition copyrightEdward Thomson2015-09-031-0/+46
| | | | | | 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.
* CMake: fall back to OpenSSL on older OS XCarlos Martín Nieto2015-09-031-2/+12
| | | | | | | | | | 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.
* diff: don't error out on an invalid regexCarlos Martín Nieto2015-09-032-7/+32
| | | | | | 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.
* http: propagate the credentials callback's error codeCarlos Martín Nieto2015-09-031-1/+9
| | | | | | | | | | | | 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.
* Fix bug in git_smart__push: push_transfer_progress cb is never calledDan Leehr2015-09-031-1/+1
| | | | The conditional checked cbs->transfer_progress then used the value in cbs->push_transfer_progress. In both cases it should be push_transfer_progress
* remote: don't confuse tag auto-follow rules with refspec matchingCarlos Martín Nieto2015-09-031-4/+10
| | | | | | 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.
* curl: use the most secure auth method for the proxyCarlos Martín Nieto2015-09-031-0/+1
| | | | | | | 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.
* Forcing libssh2 lib locationSlava Karpenko2015-09-031-1/+1
| | | | OS X may have libssh2 in diff locations, so CHECK_LIBRARY_EXISTS may check the wrong lib; forcing it to use a found directory.
* Merge pull request #3359 from nodegit/maint/v0.23-duplicate-basename-fixEdward Thomson2015-08-053-3/+2
|\ | | | | Fix duplicate basenames to support older VS on maint/v0.23
| * Fix duplicate basenames to support older VSJohn Haley2015-08-053-3/+2
|/ | | | | | | 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
* Bump version to v0.23.1v0.23.1Carlos Martín Nieto2015-08-031-2/+2
|
* Merge pull request #3349 from libgit2/cmn/for-v23Carlos Martín Nieto2015-08-0324-31/+137
|\ | | | | A second round of 0.23 maint updates
| * Stage an unregistered submodule in _add_bypath()Edward Thomson2015-08-032-5/+71
| |
| * filebuf: remove lockfile upon rename errorsCarlos Martín Nieto2015-08-033-2/+9
| | | | | | | | | | | | | | | | | | | | 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.
| * filebuf: failing test for leaving the lockfile when failing to renameCarlos Martín Nieto2015-08-031-0/+27
| | | | | | | | | | When we fail to rename, we currently leave the lockfile laying around. This shows that behaviour.
| * Increase required version of cmake to 2.8Tony Kelman2015-08-032-2/+2
| |
| * Handle ssh:// and git:// urls containing a '~' character.Simon2015-08-032-0/+4
| | | | | | | | | | For such a path '/~/...' the leading '/' is stripped so the server will get a path starting with '~' and correctly handle it.
| * Remove extra semicolon outside of a functionStefan Widgren2015-08-035-6/+6
| | | | | | | | | | Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
| * Cherry-pick PR #3332: Resolve documentation warningsCarlos Martín Nieto2015-08-038-10/+13
| |
| * case-insensitive check for WWW-Authenticate headerAnders Borum2015-08-031-1/+1
| | | | | | Fixes issue #3338
| * iterator: adjust unreadable-dir test to new behaviourCarlos Martín Nieto2015-08-031-5/+1
| | | | | | | | | | 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.
| * iterator: skip over errors in diriter initCarlos Martín Nieto2015-08-031-1/+4
|/ | | | | | | | | 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.
* Merge pull request #3333 from libgit2/cmn/for-v23Carlos Martín Nieto2015-08-0138-121/+363
|\ | | | | Maintenance updates for v0.23
| * Make libgit2 work on Windows Vista againSven Strickroth2015-07-281-3/+8
| | | | | | | | | | | | (fixes issue #3316) Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * Document git_fetch_options struct and fix typo.Ryan Roden-Corrent2015-07-281-1/+9
| | | | | | | | | | | | | | | | 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).
| * Fix macro redefinition warningFallso2015-07-281-0/+2
| |
| * submodule: normalize slashes in resolve_urlCarlos Martín Nieto2015-07-281-0/+15
| | | | | | | | | | | | Our path functions expect to work with slashes, so convert a path with backslashes into one with slashes at the top of the function.
| * submodule: add failing test for backslash in urlCarlos Martín Nieto2015-07-281-0/+23
| |
| * Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-2811-20/+20
| | | | | | | | 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.
| * filter: make sure to close the stream even on errorCarlos Martín Nieto2015-07-281-7/+9
| | | | | | | | | | When the stream list init or write fail, we must also make sure to close the stream, as that's the function contract.
| * index: allow add_bypath to update submodulesCarlos Martín Nieto2015-07-282-2/+34
| | | | | | | | | | Similarly to how git itself does it, allow the index update operation to stage a change in a submodule's HEAD.
| * blob: fail to create a blob from a dir with EDIRECTORYCarlos Martín Nieto2015-07-283-0/+30
| | | | | | | | | | This also affects `git_index_add_bypath()` by providing a better error message and a specific error code when a directory is passed.
| * errors: add EDIRECTORYCarlos Martín Nieto2015-07-281-0/+1
| | | | | | | | | | This is to be returned when the operation which the user asked for is not possible to do on a directory.
| * submodule: lookup the submodule by path if availableCarlos Martín Nieto2015-07-281-1/+1
| | | | | | | | | | | | 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.
| * submdule: reproduce double-reporting of a submodule in foreachCarlos Martín Nieto2015-07-281-0/+18
| | | | | | | | | | | | 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.
| * khash: add eol so picky compilers stop warningEdward Thomson2015-07-281-1/+1
| |
| * xdiff: cleanup some warningsEdward Thomson2015-07-282-1/+3
| |
| * xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-2812-76/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * revert: correct test that added trailing newlineEdward Thomson2015-07-281-10/+12
| |
| * merge_files: don't add trailing newlinesEdward Thomson2015-07-281-0/+39
| | | | | | | | | | When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.
| * Fix undefined reference with old versions of opensslTony Kelman2015-07-281-0/+2
|/ | | | | | | | | | | | 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 ```
* Update CHANGELOG with the release numberv0.23.0Carlos Martín Nieto2015-07-061-1/+10
|
* Merge pull request #3290 from libgit2/cmn/filter-docv0.23.0-rc2Carlos Martín Nieto2015-07-031-2/+35
|\ | | | | filter: add docs for streaming filters
| * filter: add docs for streaming filterscmn/filter-docCarlos Martín Nieto2015-07-031-2/+35
|/ | | | | 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.
* Merge pull request #3289 from ethomson/warnings4Carlos Martín Nieto2015-07-031-2/+2
|\ | | | | iterator_walk: cast away constness for free
| * iterator_walk: cast away constness for freeEdward Thomson2015-07-021-2/+2
| |
* | Merge pull request #3287 from ethomson/filter_test_cleanupCarlos Martín Nieto2015-07-021-6/+1
|\ \ | |/ |/| filter::stream: free the filter sanely
| * filter::stream: free the filter sanelyEdward Thomson2015-07-021-6/+1
| | | | | | | | | | | | 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).