summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | remote: don't confuse tag auto-follow rules with refspec matchingcmn/mirror-refspecCarlos Martín Nieto2015-08-111-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.
* | | | 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
* | | errors: tighten up git_error_state OOMs a bit moreEdward Thomson2015-08-035-41/+58
| | | | | | | | | | | | | | | 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.
* | | | 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-031-1/+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.
* | | Merge pull request #3325 from libgit2/cmn/filebuf-rename-errorEdward Thomson2015-08-032-1/+8
|\ \ \ | | | | | | | | filebuf: remove lockfile upon rename errors
| * | | filebuf: remove lockfile upon rename errorscmn/filebuf-rename-errorCarlos Martín Nieto2015-07-242-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #3344 from libgit2/cmn/add-unreg-submoduleEdward Thomson2015-08-031-5/+58
|\ \ \ \ | | | | | | | | | | 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.
* | | | | 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-012-2/+4
|\ \ \ \ | | | | | | | | | | Resolve documentation warnings
| * | | | Better param docsBen Chatelain2015-07-281-1/+3
| | | | |
| * | | | Fix remaining documentation warningsBen Chatelain2015-07-272-2/+2
| | |_|/ | |/| |
* | | | 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-291-1/+4
|\ \ \ \ | | | | | | | | | | iterator: skip over errors in diriter init
| * | | | 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.
* | | | | 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-243-0/+32
|\ \ \ \ | | | | | | | | | | 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.
* | | | | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-242-2/+28
|\ \ \ \ \ | | | | | | | | | | | | Allow adding a submodule through git_index_add_bypath
| * | | | | index: allow add_bypath to update submodulescmn/index-add-submoduleCarlos Martín Nieto2015-07-121-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also affects `git_index_add_bypath()` by providing a better error message and a specific error code when a directory is passed.
* | | | | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-242-12/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | refdb: delete a ref's reflog upon deletion
| * | | | | | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-122-12/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2238-118/+1004
|\ \ \ \ | |/ / /
| * | | Merge pull request #3311 from Fallso/MacroRedefinitionEdward Thomson2015-07-151-0/+2
| |\ \ \ | | | | | | | | | | Fix macro redefinition warning
| | * | | Fix macro redefinition warningFallso2015-07-151-0/+2
| | | | |
| * | | | Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-131-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | List a submodule only once when the path matches a submodule in the index
| | * | | submodule: lookup the submodule by path if availablecmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-111-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.
| * | | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-127-14/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-127-14/+14
| | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #3301 from ethomson/warningsCarlos Martín Nieto2015-07-103-2/+4
| |\ \ \ | | | | | | | | | | Clean up some warnings
| | * | | khash: add eol so picky compilers stop warningEdward Thomson2015-07-101-1/+1
| | | | |
| | * | | xdiff: cleanup some warningsEdward Thomson2015-07-102-1/+3
| | | | |
| * | | | Merge pull request #3297 from tkelman/patch-2Carlos Martín Nieto2015-07-101-0/+2
| |\ \ \ \ | | | | | | | | | | | | Fix undefined reference with old versions of openssl
| | * | | | Fix undefined reference with old versions of opensslTony Kelman2015-07-071-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 ```
| * | | | | git_cert: child types use proper base typeEdward Thomson2015-07-105-13/+14
| | |/ / / | |/| | |
| * | | | Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-091-2/+5
| |\ \ \ \ | | | | | | | | | | | | filters: custom filters with wildcard attributes
| | * | | | filters: custom filters with wildcard attributesEdward Thomson2015-07-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom filters with wildcard attributes, so that clients can support some random `filter=foo` in a .gitattributes and look up the corresponding smudge/clean commands in the configuration file.
| * | | | | xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-0712-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).
| * | | | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-071-0/+25
| |\ \ \ \ | | | | | | | | | | | | Added git_diff_index_to_index()
| | * | | | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+25
| | | | | |
View Lorry Controller Status