summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #3578 from bubaflub/fix_small_memory_leakCarlos Martín Nieto2016-02-051-1/+4
|\ \ \ \ | | | | | | | | | | Free allocated pointer to curl stream on error
| * | | | Free allocated pointer to curl stream on errorBob Kuo2016-01-161-1/+4
| |/ / /
* | | | Merge pull request #3579 from ethomson/mingw_winhttpEdward Thomson2016-02-051-2/+7
|\ \ \ \ | | | | | | | | | | winhttp: name mangle class / iid on mingw
| * | | | winhttp: name mangle class / iid on mingwEdward Thomson2016-01-191-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standard Windows type systems define CLSID_InternetSecurityManager and IID_IInternetSecurityManager, but MinGW lacks these definitions. As a result, we must hardcode these definitions ourselves. However, we should not use a public struct with those names, lest another library do the same thing and consumers cannot link to both.
* | | | Merge pull request #3584 from jbreeden/export_fnEdward Thomson2016-02-041-1/+1
|\ \ \ \ | | | | | | | | | | Export git_stash_apply_init_options
| * | | | Export git_stash_apply_init_optionsjbreeden2016-01-231-1/+1
| |/ / /
* | | | Merge pull request #3594 from Ephemera/patch-1Edward Thomson2016-02-041-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo
| * | | | Fix typoEphemera2016-02-051-1/+1
|/ / / /
* | | | Merge pull request #3593 from nvanheuverzwijn/patch-1Edward Thomson2016-02-041-1/+1
|\ \ \ \ | |/ / / |/| | | Fix a typo in documentation
| * | | Fix a typo in documentationNicolas Vanheuverzwijn2016-02-031-1/+1
|/ / /
* | | Merge pull request #3573 from pmq20/master-12jan16Carlos Martín Nieto2016-01-162-9/+2
|\ \ \ | | | | | | | | Make packfile_unpack_compressed a private API
| * | | Make packfile_unpack_compressed a private APIP.S.V.R2016-01-132-9/+2
| |/ /
* | | Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issuesCarlos Martín Nieto2016-01-132-2/+3
|\ \ \ | |/ / |/| | Fix some issues with generated pkg-config file
| * | Wrap path in quotes to support paths containing whitespace.Arthur Schreiber2016-01-091-1/+1
| | |
| * | Add winhttp dependencies to pc file.Arthur Schreiber2016-01-091-1/+2
|/ /
* | Merge pull request #3562 from mgorny/ssh-read-stderr-failCarlos Martín Nieto2015-12-291-3/+8
|\ \ | | | | | | ssh_stream_read(): fix possible *bytes_read < 0 branch
| * | ssh_stream_read(): fix possible *bytes_read < 0 branchMichał Górny2015-12-261-3/+8
| | | | | | | | | | | | | | | | | | Fix the possibility of returning successfully from ssh_stream_read() with *bytes_read < 0. This would occur if stdout channel read resulted in 0, and stderr channel read failed afterwards.
* | | Merge pull request #3558 from libgit2/cmn/index-nolockCarlos Martín Nieto2015-12-282-131/+15
|\ \ \ | | | | | | | | index: get rid of the locking
| * | | index: get rid of the lockingcmn/index-nolockCarlos Martín Nieto2015-12-282-131/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't support using an index object from multiple threads at the same time, so the locking doesn't have any effect when following the rules. If not following the rules, things are going to break down anyway.
* | | | Merge pull request #3565 from ethomson/templatesCarlos Martín Nieto2015-12-282-40/+136
|\ \ \ \ | |_|_|/ |/| | | Handle dotfiles as the repo template dir and inside the template dir
| * | | git_repository_init: include dotfiles when copying templatesEdward Thomson2015-12-262-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Include dotfiles when copying template directory, which will handle both a template directory itself that begins with a dotfile, and any dotfiles inside the directory.
| * | | repo::init tests: test a template dir with leading dotEdward Thomson2015-12-261-9/+37
| | | | | | | | | | | | | | | | | | | | Ensure that we can handle template directories that begin with a leading dot.
| * | | repo::init tests: test init.templatedir settingEdward Thomson2015-12-261-38/+93
| | | | | | | | | | | | | | | | | | | | Ensure that `git_repository_init` honors the `init.templatedir` configuration setting.
* | | | Merge pull request #3552 from ReadmeCritic/masterEdward Thomson2015-12-261-7/+7
|\ \ \ \ | |/ / / |/| | | Update README URLs based on HTTP redirects
| * | | Update libgit2-glib linkReadmeCritic2015-12-261-1/+1
| | | |
| * | | Update README URLs based on HTTP redirectsReadmeCritic2015-12-171-7/+7
| | | |
* | | | Merge pull request #3546 from Cruel/masterEdward Thomson2015-12-262-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fix a couple function signatures
| * | | Fix a couple function signaturesThomas Edvalson2015-12-142-2/+2
| | | |
* | | | Merge pull request #3560 from drusk/readme_typoEdward Thomson2015-12-231-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fixed minor typo in README.md.
| * | | Fixed minor typo in README.md.drusk2015-12-231-1/+1
|/ / /
* | | Merge pull request #3554 from olshevskiy87/masterCarlos Martín Nieto2015-12-213-3/+3
|\ \ \ | |_|/ |/| | typos in comments
| * | typos in commentsDmitriy Olshevskiy2015-12-213-3/+3
|/ /
* | Merge pull request #3551 from libgit2/vmg/commit-leakVicent Marti2015-12-171-1/+1
|\ \ | | | | | | commit: Fix memory leak in test suite
| * | commit: Fix memory leak in test suitevmg/commit-leakVicent Marti2015-12-171-1/+1
|/ /
* | Merge pull request #3550 from libgit2/vmg/index-fill-2Vicent Marti2015-12-174-14/+32
|\ \ | | | | | | Index fill: Small fixups
| * | index: Also size-hint the hash tablevmg/index-fill-2Vicent Marti2015-12-162-4/+3
| | | | | | | | | | | | | | | | | | | | | Note that we're not checking whether the resize succeeds; in OOM cases, we let it run with a "small" vector and hash table and see if by chance we can grow it dynamically as we insert the new entries. Nothing to lose really.
| * | index: Preallocate the entries vector with size hintVicent Marti2015-12-163-0/+16
| | |
| * | index: Adjust namemask & mode when fillingVicent Marti2015-12-161-14/+17
| | |
* | | Merge pull request #3548 from tepas/patch-1Carlos Martín Nieto2015-12-161-2/+2
|\ \ \ | |/ / |/| | fix git_blob_create_fromchunks documentation
| * | fix git_blob_create_fromchunks documentationtepas2015-12-161-2/+2
| |/ | | | | putting `0.` at the start of the line turns it into a numbered list.
* | Merge pull request #3549 from libgit2/vmg/index-fillCarlos Martín Nieto2015-12-163-5/+41
|\ \ | |/ |/| merge: Use `git_index__fill` to populate the index
| * merge: Use `git_index__fill` to populate the indexvmg/index-fillVicent Marti2015-12-163-5/+41
|/ | | | | | | | | | | | | Instead of calling `git_index_add` in a loop, use the new `git_index_fill` internal API to fill the index with the initial staged entries. The new `fill` helper assumes that all the entries will be unique and valid, so it can append them at the end of the entries vector and only sort it once at the end. It performs no validation checks. This prevents the quadratic behavior caused by having to sort the entries list once after every insertion.
* Merge pull request #3528 from chescock/Passthrough-from-credential-callbackEdward Thomson2015-12-141-1/+4
|\ | | | | Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set.
| * Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set.Chris Hescock2015-12-011-1/+4
| |
* | Merge pull request #3521 from pks-t/blame-line-overflowEdward Thomson2015-12-1414-44/+60
|\ \ | | | | | | Line count overflow in git_blame_hunk and git_blame__entry
| * | blame: use size_t for line counts in git_blame__entryPatrick Steinhardt2015-12-012-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_blame__entry` struct keeps track of line counts with `int` fields. Since `int` is only guaranteed to be at least 16 bits we may overflow on certain platforms when line counts exceed 2^15. Fix this by instead storing line counts in `size_t`.
| * | blame: use size_t for line counts in git_blame_hunkPatrick Steinhardt2015-12-0112-25/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not unreasonable to have versioned files with a line count exceeding 2^16. Upon blaming such files we fail to correctly keep track of the lines as `git_blame_hunk` stores them in `uint16_t` fields. Fix this by converting the line fields of `git_blame_hunk` to `size_t`. Add test to verify behavior.
* | | Merge pull request #3522 from pks-t/email-format-commit-messageCarlos Martín Nieto2015-12-1013-3/+139
|\ \ \ | | | | | | | | diff: include commit message when formatting patch
| * | | diff: include commit message when formatting patchPatrick Steinhardt2015-12-019-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | When formatting a patch as email we do not include the commit's message in the formatted patch output. Implement this and add a test that verifies behavior.
| * | | commit: introduce `git_commit_body`Patrick Steinhardt2015-12-014-0/+81
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | It is already possible to get a commit's summary with the `git_commit_summary` function. It is not possible to get the remaining part of the commit message, that is the commit message's body. Fix this by introducing a new function `git_commit_body`.
View Lorry Controller Status