summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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`.
* | | Merge pull request #3538 from pks-t/pks/index-memory-leakCarlos Martín Nieto2015-12-101-1/+1
|\ \ \ | | | | | | | | index: always queue `remove_entry` for removal
| * | | index: always queue `remove_entry` for removalPatrick Steinhardt2015-12-081-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When replacing an index with a new one, we need to iterate through all index entries in order to determine which entries are equal. When it is not possible to re-use old entries for the new index, we move it into a list of entries that are to be removed and thus free'd. When we encounter a non-zero error code, though, we skip adding the current index entry to the remove-queue. `INSERT_MAP_EX`, which is the function last run before adding to the remove-queue, may return a positive non-zero code that indicates what exactly happened while inserting the element. In this case we skip adding the entry to the remove-queue but still continue the current operation, leading to a leak of the current entry. Fix this by checking for a negative return value instead of a non-zero one when we want to add the current index entry to the remove-queue.
* | | Merge pull request #3542 from libgit2/cmn/reset-dir-fileCarlos Martín Nieto2015-12-092-6/+58
|\ \ \ | | | | | | | | reset: perform the checkout before moving HEAD or the index
| * | | reset: perform the checkout before moving HEAD or the indexcmn/reset-dir-fileCarlos Martín Nieto2015-12-092-6/+58
|/ / / | | | | | | | | | | | | | | | This keeps the state of the workdir the same as one from HEAD, removing a source of possible confusion when calculating the work that is to be done.
* | | CHANGELOG: add some things we missedCarlos Martín Nieto2015-12-091-1/+11
| | |
* | | Merge pull request #3539 from libgit2/typedef-submodule-cbCarlos Martín Nieto2015-12-082-2/+13
|\ \ \ | | | | | | | | Use a typedef for the submodule_foreach callback.
| * | | Play nice with the docs.typedef-submodule-cbjoshaber2015-12-081-5/+4
| | | |
| * | | Use a typedef for the submodule_foreach callback.joshaber2015-12-082-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | This fits with the style for the rest of the project, but more importantly, makes life easier for bindings authors who auto-generate code.
* | | | Merge pull request #3537 from libgit2/cmn/tree-is-sortedEdward Thomson2015-12-082-1/+6
|\ \ \ \ | |/ / / |/| | | tree: mark a tree as already sorted
| * | | tree: mark a tree as already sortedcmn/tree-is-sortedCarlos Martín Nieto2015-12-062-1/+6
| | | | | | | | | | | | | | | | | | | | The trees are sorted on-disk, so we don't have to go over them again. This cuts almost a fifth of time spent parsing trees.
* | | | Merge pull request #3526 from sschuberth/cmake-number-compareCarlos Martín Nieto2015-12-061-1/+1
|\ \ \ \ | | | | | | | | | | CMakeLists: Compare CMAKE_SIZEOF_VOID_P as a number, not as a string
| * | | | CMakeLists: Compare CMAKE_SIZEOF_VOID_P as a number, not as a stringSebastian Schuberth2015-12-021-1/+1
| | |/ / | |/| |
* | | | Merge pull request #3529 from mgorny/fix-checkout-test-umaskCarlos Martín Nieto2015-12-061-1/+1
|\ \ \ \ | |_|/ / |/| | | checkout test: Apply umask to file-mode test as well
| * | | checkout test: Apply umask to file-mode test as wellMichał Górny2015-12-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix the file-mode test to expect system umask being applied to the created file as well (it is currently applied to the directory only). This fixes the test on systems where umask != 022. Signed-off-by: Michał Górny <mgorny@gentoo.org>
* | | Merge pull request #3530 from libgit2/cmn/parse-modeEdward Thomson2015-12-031-5/+21
|\ \ \ | | | | | | | | tree: use a specialised mode parse function
| * | | tree: use a specialised mode parse functioncmn/parse-modeCarlos Martín Nieto2015-12-021-5/+21
| |/ / | | | | | | | | | | | | Instead of going out to strtol, which is made to parse generic numbers, copy a parse function from git which is specialised for file modes.
View Lorry Controller Status