summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* curl: use the most secure auth method for the proxycmn/curl-proxyauth-anyCarlos Martín Nieto2015-08-061-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.
* Merge pull request #3360 from nodegit/master-duplicate-basename-fixEdward Thomson2015-08-054-4/+3
|\ | | | | Fix duplicate basenames to support older VS on master
| * Fix duplicate basenames to support older VSJohn Haley2015-08-054-4/+3
|/ | | | | | | 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
* Merge pull request #3351 from ethomson/error_bufCarlos Martín Nieto2015-08-049-72/+149
|\ | | | | Error handling: use buffers, improved OOM handling
| * errors: tighten up git_error_state OOMs a bit moreEdward Thomson2015-08-036-46/+86
| | | | | | | | | | When an error state is an OOM, make sure that we treat is specially and do not try to free it.
| * Merge remote-tracking branches 'upstream/pr/3323' and 'upstream/pr/3329'Edward Thomson2015-08-033-23/+42
| |\
| | * error: store the error messages in a reusable buffercmn/error-bufferCarlos Martín Nieto2015-07-283-23/+42
| | | | | | | | | | | | | | | | | | | | | Instead of allocating a brand new buffer for each error string we want to store, we can use a per-thread buffer to store the error string and re-use the underlying storage. We already use the buffer to format the string, so this mostly makes that more direct.
| * | Test: check restored oom error points to static bufferMichael Procter2015-08-031-4/+4
| | |
| * | Make giterr_restore aware of g_git_oom_errorMichael Procter2015-08-031-8/+11
| | | | | | | | | | | | | | | | | | | | | Allow restoring a previously captured oom error, by detecting when the captured message pointer points to the static oom error message. This means there is no need to strdup the message in giterr_detach.
| * | Make giterr_detach no longer publicMichael Procter2015-08-032-13/+1
| | |
| * | Ensure static oom error message not detachedMichael Procter2015-08-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Error messages that are detached are assumed to be dynamically allocated. Passing a pointer to the static oom error message can cause an attempt to free the static buffer later. This change checks if the oom error message is about to be detached and detaches a copy instead.
| * | Add failing test for capture/restore oom errorMichael Procter2015-08-031-0/+23
|/ /
* | Merge pull request #3325 from libgit2/cmn/filebuf-rename-errorEdward Thomson2015-08-033-1/+35
|\ \ | | | | | | filebuf: remove lockfile upon rename errors
| * | filebuf: remove lockfile upon rename errorscmn/filebuf-rename-errorCarlos Martín Nieto2015-07-243-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-07-241-0/+27
| | | | | | | | | | | | | | | When we fail to rename, we currently leave the lockfile laying around. This shows that behaviour.
* | | Merge pull request #3344 from libgit2/cmn/add-unreg-submoduleEdward Thomson2015-08-032-5/+71
|\ \ \ | | | | | | | | index: stage an unregistered submodule as well
| * | | index: stage an unregistered submodule as wellcmn/add-unreg-submoduleCarlos Martín Nieto2015-08-011-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | We previously added logic to `_add_bypath()` to update a submodule. Go further and stage the submodule even if it's not registered to behave like git.
| * | | index: test that an unregistered submodule gets stagedCarlos Martín Nieto2015-08-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | When we pass the path of a repository to `_bypath()`, we should behave like git and stage it as a `_COMMIT` regardless of whether it is registered a a submodule.
| * | | index: add test for adding an old-style submodule to indexLinquize2015-08-011-0/+7
| | | |
* | | | Merge pull request #3348 from MrHacky/remote-path-with-tildeCarlos Martín Nieto2015-08-032-0/+4
|\ \ \ \ | |/ / / |/| | | Handle ssh:// and git:// urls containing a '~' character.
| * | | 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.
* | | Merge pull request #3332 from phatblat/ben/doc-warningsCarlos Martín Nieto2015-08-018-10/+13
|\ \ \ | | | | | | | | Resolve documentation warnings
| * | | Better param docsBen Chatelain2015-07-281-1/+3
| | | |
| * | | Fix remaining documentation warningsBen Chatelain2015-07-274-4/+4
| | | |
| * | | Add -Wdocumentation flag if supportedBen Chatelain2015-07-271-0/+1
| | | |
| * | | Use correct Doxygen trailing comment syntaxBen Chatelain2015-07-271-4/+4
| | | |
| * | | Fix @param names in doc commentsBen Chatelain2015-07-273-3/+3
| | | |
* | | | Merge pull request #3341 from stewid/pedantic-compiler-warningEdward Thomson2015-07-315-6/+6
|\ \ \ \ | | | | | | | | | | Remove extra semicolon outside of a function
| * | | | Remove extra semicolon outside of a functionStefan Widgren2015-07-315-6/+6
|/ / / / | | | | | | | | | | | | | | | | Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
* | | | Merge pull request #3328 from libgit2/cmn/iterator-skip-diriterEdward Thomson2015-07-292-6/+5
|\ \ \ \ | | | | | | | | | | iterator: skip over errors in diriter init
| * | | | iterator: adjust unreadable-dir test to new behaviourcmn/iterator-skip-diriterCarlos Martín Nieto2015-07-271-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-07-261-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 #3339 from palmin/palmin-issue-3338Edward Thomson2015-07-291-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | case-insensitive check for WWW-Authenticate header
| * | | | case-insensitive check for WWW-Authenticate headerAnders Borum2015-07-291-1/+1
|/ / / / | | | | | | | | Fixes issue #3338
* | | | Merge pull request #3307 from libgit2/cmn/submodule-backslashEdward Thomson2015-07-244-0/+55
|\ \ \ \ | | | | | | | | | | Normalize submodule urls before looking at them
| * | | | submodule, path: extract slash conversioncmn/submodule-backslashCarlos Martín Nieto2015-07-133-7/+24
| | | | | | | | | | | | | | | | | | | | Extract the backslash-to-slash conversion into a helper function.
| * | | | submodule: normalize slashes in resolve_urlCarlos Martín Nieto2015-07-131-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-131-0/+23
| | | | |
* | | | | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-245-2/+65
|\ \ \ \ \ | | | | | | | | | | | | Allow adding a submodule through git_index_add_bypath
| * | | | | index: allow add_bypath to update submodulescmn/index-add-submoduleCarlos Martín Nieto2015-07-122-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-123-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-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be returned when the operation which the user asked for is not possible to do on a directory.
* | | | | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-245-14/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | refdb: delete a ref's reflog upon deletion
| * | | | | | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-125-14/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing a reflog upon ref deletion is something which only some backends might wish to do. Backends which are database-backed may wish to archive a reflog, log-based ones may not need to do anything.
* | | | | | Merge pull request #3304 from libgit2/cmn/checkout-free-streamEdward Thomson2015-07-241-7/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | filter: make sure to close the stream even on error
| * | | | | filter: make sure to close the stream even on errorcmn/checkout-free-streamCarlos Martín Nieto2015-07-121-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.
* | | | | Merge pull request #3317 from csware/fix-vistaEdward Thomson2015-07-231-3/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make libgit2 work on Windows Vista again
| * | | | Make libgit2 work on Windows Vista againSven Strickroth2015-07-221-3/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | (fixes issue #3316) Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge pull request #3322 from libgit2/fix-init-orderingJosh Abernathy2015-07-221-1/+1
|\ \ \ \ | |/ / / |/| | | Increment `git__n_inits` before doing `init_once`.
| * | | Merge branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2266-379/+1753
| |\ \ \ | |/ / / |/| | |