Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pool: Never return unaligned buffersvmg/pool-align | Vicent Marti | 2015-11-13 | 1 | -8/+16 |
| | |||||
* | Merge pull request #3170 from CmdrMoozy/nsec_fix | Carlos Martín Nieto | 2015-11-12 | 10 | -34/+136 |
|\ | | | | | git_index_entry__init_from_stat: set nsec fields in entry stats | ||||
| * | diff: refactor complex timestamp check into its own function | Axel Rasmussen | 2015-10-01 | 1 | -5/+27 |
| | | |||||
| * | index: don't populate nsec values if GIT_USE_NSEC is off | Axel Rasmussen | 2015-10-01 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'master' into nsec_fix_next | Axel Rasmussen | 2015-10-01 | 16 | -56/+226 |
| |\ | |||||
| * | | apple: work around non-POSIX struct stat on OS X. | Axel Rasmussen | 2015-09-18 | 1 | -6/+17 |
| | | | |||||
| * | | diff/index: respect USE_NSEC for racily clean file detection | Axel Rasmussen | 2015-09-18 | 4 | -13/+30 |
| | | | |||||
| * | | win32: define our own POSIX struct stat, and support USE_NSEC | Axel Rasmussen | 2015-09-18 | 5 | -17/+57 |
| | | | |||||
| * | | cmake: Only provide USE_NSEC if struct stat members are avilable. | Axel Rasmussen | 2015-09-18 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | This allows us to remove OS checks from source code, instead relying on CMake to detect whether or not `struct stat` has the nanoseconds members we rely on. | ||||
| * | | settings: expose GIT_USE_NSEC flag in git_libgit2_features | Axel Rasmussen | 2015-09-18 | 1 | -0/+3 |
| | | | |||||
| * | | cmake: add USE_NSEC, and only check nanosec m/ctime if enabled | Axel Rasmussen | 2015-09-18 | 2 | -2/+9 |
| | | | |||||
* | | | Merge pull request #3499 from ethomson/ref_dir_errmsgs | Carlos Martín Nieto | 2015-11-12 | 2 | -5/+21 |
|\ \ \ | | | | | | | | | Improve error messages when dirs prevent ref/reflog creation | ||||
| * | | | reflog: error when a directory is at reflog path | Edward Thomson | 2015-11-12 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | When a non-empty directory exists and prevents the creation of a reflog, provide a more informative error message. | ||||
| * | | | refs: complain when a directory exists at ref | Edward Thomson | 2015-11-12 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | When a (non-empty) directory exists at the reference target location, complain with a more actionable error message. | ||||
| * | | | filebuf: detect directories in our way | Edward Thomson | 2015-11-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | When creating a filebuf, detect a directory that exists in our target file location. This prevents a failure later, when we try to move the lock file to the destination. | ||||
* | | | | Merge pull request #3448 from libgit2/cmn/custom-agent | Carlos Martín Nieto | 2015-11-12 | 5 | -3/+69 |
|\ \ \ \ | | | | | | | | | | | Support setting custom user-agent | ||||
| * | | | | winhttp: use a custom user-agent if the user has set it | Carlos Martín Nieto | 2015-11-12 | 1 | -2/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We also keep the "git/1.0" prefix in order to maintain compatibility with hosters. | ||||
| * | | | | http: use a custom user-agent if the user has set it | Carlos Martín Nieto | 2015-11-12 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We still prefix it with "git/1.0" since that's required in many situations, but we replace the area which mentions libgit2. | ||||
| * | | | | settings: add a setter for a custom user-agent | Carlos Martín Nieto | 2015-11-12 | 3 | -0/+23 |
| | | | | | |||||
* | | | | | index: overwrite the path when inserting conflictsntk/case_index_conflicts | Carlos Martín Nieto | 2015-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we insert a conflict in a case-insensitive index, accept the new entry's path as the correct case instead of leaving the path we already had. This puts `git_index_conflict_add()` on the same level as `git_index_add()` in this respect. | ||||
* | | | | | index: correctly report which conflict stage has a wrong filemode | Carlos Martín Nieto | 2015-11-12 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | When we're at offset 'i', we're dealing with the 'i+1' stage, since conflicts start at 1. | ||||
* | | | | Merge pull request #3498 from ethomson/windows_symlinks | Carlos Martín Nieto | 2015-11-08 | 1 | -0/+25 |
|\ \ \ \ | | | | | | | | | | | Diff: Honor `core.symlinks=false` and fake symlinks | ||||
| * | | | | diff: on win32, treat fake "symlinks" specially | Edward Thomson | 2015-11-03 | 1 | -0/+25 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | On platforms that lack `core.symlinks`, we should not go looking for symbolic links and `p_readlink` their target. Instead, we should examine the file's contents. | ||||
* | | | | Merge pull request #3500 from ethomson/submodules_with_path | Carlos Martín Nieto | 2015-11-08 | 1 | -24/+18 |
|\ \ \ \ | | | | | | | | | | | Handle submodules with paths in `git_submodule_update` | ||||
| * | | | | submodule: reload HEAD/index after reading config | Edward Thomson | 2015-11-04 | 1 | -24/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the HEAD and index data for a submodule after reading the configuration. The configuration may specify a `path`, so we must update HEAD and index data with that path in mind. | ||||
* | | | | | Merge pull request #3465 from libgit2/cmn/tls-register | Edward Thomson | 2015-11-04 | 2 | -0/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | stream: allow registering a user-provided TLS constructor | ||||
| * | | | | stream: allow registering a user-provided TLS constructorcmn/tls-register | Carlos Martín Nieto | 2015-11-03 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows the application to use their own TLS stream, regardless of the capabilities of libgit2 itself. | ||||
| * | | | | stream: accept NULL in the free function | Carlos Martín Nieto | 2015-11-03 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Fix git_commit_summary to convert newlines to spaces even after | Stjepan Rajko | 2015-11-03 | 1 | -10/+25 |
|/ / / / | | | | | | | | | | | | | whitespace. Collapse spaces around newlines for the summary. | ||||
* | | | | Add diff progress callback. | Jason Haslam | 2015-11-02 | 1 | -2/+13 |
|/ / / | |||||
* | | | Merge pull request #3491 from libgit2/cmn/config-checksum | Edward Thomson | 2015-11-02 | 3 | -36/+39 |
|\ \ \ | | | | | | | | | Use checksums to detect config file changes | ||||
| * | | | filebuf: use an internal buffercmn/config-checksum | Carlos Martín Nieto | 2015-10-30 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reduces the chances of a crash in the thread tests. This shouldn't affect general usage too much, since the main usage of these functions are to read into an empty buffer. | ||||
| * | | | filebuf: use a checksum to detect file changes | Carlos Martín Nieto | 2015-10-30 | 3 | -34/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on the size and timestamp, which can hide changes performed in the same second, hash the file content's when we care about detecting changes. | ||||
* | | | | merge-base: Style | Vicent Marti | 2015-11-02 | 1 | -1/+6 |
| | | | | |||||
* | | | | merge-base: Do not read parents from the root | Vicent Marti | 2015-11-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | merge-base: Remove redundant merge bases | Vicent Marti | 2015-11-02 | 2 | -22/+166 |
|/ / / | |||||
* | | | Merge pull request #3493 from ethomson/read_index | Carlos Martín Nieto | 2015-10-30 | 1 | -9/+29 |
|\ \ \ | | | | | | | | | index: read_index must update hashes | ||||
| * | | | index: read_index must update hashes | Edward Thomson | 2015-10-30 | 1 | -9/+29 |
| | | | | |||||
* | | | | git: put NULL check at the top | Carlos Martín Nieto | 2015-10-30 | 1 | -2/+5 |
|/ / / | |||||
* | | | git: accept NULL as argument to its stream free | Carlos Martín Nieto | 2015-10-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3486 from srajko/reflog-segfault-fix | Carlos Martín Nieto | 2015-10-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix segfault when reading reflog with extra newlines | ||||
| * | | | Prevent segfault when parsing a reflog with oid parse error | Stjepan Rajko | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Using calloc instead of malloc because the parse error will lead to an immediate free of committer (and its properties, which can segfault on free if undefined - test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error segfaulted before the fix). #3458 | ||||
* | | | | pool: fix documentation | Edward Thomson | 2015-10-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | merge: Do not mallocz unecessary entriesvmg/pool | Vicent Marti | 2015-10-28 | 1 | -2/+2 |
| | | | | |||||
* | | | | pool: update comment | Vicent Marti | 2015-10-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | pool: Dot not assume mallocs are zeroed out | Vicent Marti | 2015-10-28 | 4 | -24/+23 |
| | | | | |||||
* | | | | pool: Take into account malloc overhead & pool page size | Vicent Marti | 2015-10-28 | 1 | -1/+2 |
| | | | | |||||
* | | | | repository: plug memory leak | Vicent Marti | 2015-10-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | cc @carlosmn | ||||
* | | | | pool: Simplify implementation | Vicent Marti | 2015-10-28 | 16 | -265/+72 |
| | | | | |||||
* | | | | merge: Plug memory leakvmg/reuc-insert | Vicent Marti | 2015-10-27 | 1 | -3/+3 |
| | | | |