summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* pool: Never return unaligned buffersvmg/pool-alignVicent Marti2015-11-132-10/+18
|
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-1216-50/+175
|\ | | | | git_index_entry__init_from_stat: set nsec fields in entry stats
| * diff: refactor complex timestamp check into its own functionAxel Rasmussen2015-10-011-5/+27
| |
| * index: don't populate nsec values if GIT_USE_NSEC is offAxel Rasmussen2015-10-011-0/+3
| |
| * Merge branch 'master' into nsec_fix_nextAxel Rasmussen2015-10-0157-84/+488
| |\
| * | apple: work around non-POSIX struct stat on OS X.Axel Rasmussen2015-09-181-6/+17
| | |
| * | diff/index: respect USE_NSEC for racily clean file detectionAxel Rasmussen2015-09-186-26/+43
| | |
| * | win32: define our own POSIX struct stat, and support USE_NSECAxel Rasmussen2015-09-186-18/+58
| | |
| * | cmake: fix CMake code organization problemAxel Rasmussen2015-09-181-6/+6
| | |
| * | cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-183-5/+9
| | | | | | | | | | | | | | | | | | 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.
| * | caps: add test for GIT_FEATURES_NSECAxel Rasmussen2015-09-181-0/+6
| | |
| * | settings: expose GIT_USE_NSEC flag in git_libgit2_featuresAxel Rasmussen2015-09-182-2/+6
| | |
| * | cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-184-3/+21
| | |
* | | Merge pull request #3499 from ethomson/ref_dir_errmsgsCarlos Martín Nieto2015-11-125-5/+118
|\ \ \ | | | | | | | | Improve error messages when dirs prevent ref/reflog creation
| * | | reflog: error when a directory is at reflog pathEdward Thomson2015-11-122-4/+64
| | | | | | | | | | | | | | | | | | | | 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 refEdward Thomson2015-11-122-1/+21
| | | | | | | | | | | | | | | | | | | | When a (non-empty) directory exists at the reference target location, complain with a more actionable error message.
| * | | filebuf: detect directories in our wayEdward Thomson2015-11-032-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | reflog: test reflog is deleted when ref is deletedEdward Thomson2015-11-031-0/+18
| | | |
* | | | Merge pull request #3448 from libgit2/cmn/custom-agentCarlos Martín Nieto2015-11-128-3/+86
|\ \ \ \ | | | | | | | | | | Support setting custom user-agent
| * | | | CHANGELOG: add note about custom user-agentCarlos Martín Nieto2015-11-121-0/+3
| | | | |
| * | | | winhttp: use a custom user-agent if the user has set itCarlos Martín Nieto2015-11-121-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 itCarlos Martín Nieto2015-11-121-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-agentCarlos Martín Nieto2015-11-125-0/+37
| | | | |
* | | | | Merge pull request #2534 from libgit2/ntk/case_index_conflictsEdward Thomson2015-11-123-6/+98
|\ \ \ \ \ | |/ / / / |/| | | | Failing test for case sensitive conflicts in the index
| * | | | index: overwrite the path when inserting conflictsntk/case_index_conflictsCarlos Martín Nieto2015-11-122-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 filemodeCarlos Martín Nieto2015-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When we're at offset 'i', we're dealing with the 'i+1' stage, since conflicts start at 1.
| * | | | Failing test for case sensitive conflicts in the indexnulltoken2015-11-121-0/+91
|/ / / /
* | | | Merge pull request #3498 from ethomson/windows_symlinksCarlos Martín Nieto2015-11-083-0/+115
|\ \ \ \ | | | | | | | | | | Diff: Honor `core.symlinks=false` and fake symlinks
| * | | | index: test that add_bypath preserves symlinksEdward Thomson2015-11-031-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that on platforms without `core.symlinks`, we preserve symlinks in `git_index_add_bypath`. (Users should correct the actual index entry's mode to change a link to a regular file.)
| * | | | diff: on win32, treat fake "symlinks" speciallyEdward Thomson2015-11-031-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.
| * | | | diff: test "symlinks" in wd are respected on win32Edward Thomson2015-11-031-0/+61
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `core.symlinks = false`, we write the symlinks content (target) to a regular file. We should ensure that when we later see that regular file, we treat it specially - and that changing that regular file would actually change the symlink target. (For compatibility with Git for Windows).
* | | | Merge pull request #3500 from ethomson/submodules_with_pathCarlos Martín Nieto2015-11-0816-24/+95
|\ \ \ \ | | | | | | | | | | Handle submodules with paths in `git_submodule_update`
| * | | | submodule: reload HEAD/index after reading configEdward Thomson2015-11-041-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.
| * | | | submodule: test updating a submodule w/ a pathEdward Thomson2015-11-0415-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | Test that `git_submodule_update` can handle a submodule that is freshly cloned and has a path differing from its name.
* | | | | Merge pull request #3465 from libgit2/cmn/tls-registerEdward Thomson2015-11-045-0/+81
|\ \ \ \ \ | |/ / / / |/| | | | stream: allow registering a user-provided TLS constructor
| * | | | stream: allow registering a user-provided TLS constructorcmn/tls-registerCarlos Martín Nieto2015-11-034-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | This allows the application to use their own TLS stream, regardless of the capabilities of libgit2 itself.
| * | | | stream: accept NULL in the free functionCarlos Martín Nieto2015-11-031-0/+3
| | | | |
* | | | | Merge branch 'pr/3487'Edward Thomson2015-11-033-13/+32
|\ \ \ \ \
| * | | | | Fix git_commit_summary to convert newlines to spaces even afterStjepan Rajko2015-11-033-13/+32
|/ / / / / | | | | | | | | | | | | | | | whitespace. Collapse spaces around newlines for the summary.
* | | | | Merge pull request #3494 from leoyanggit/fix_unit_test_buildCarlos Martín Nieto2015-11-031-2/+13
|\ \ \ \ \ | |/ / / / |/| | | | Fix build for unit test
| * | | | Fix build for unit testLeo Yang2015-11-021-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | If none of GIT_OPENSSL, GIT_WINHTTP or GIT_SECURE_TRANSPORT is defined we should also be able to build the unit test.
* | | | | Merge branch 'pr/3147'Edward Thomson2015-11-025-9/+74
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add diff progress callback.Jason Haslam2015-11-025-9/+74
|/ / / /
* | | | Merge pull request #3491 from libgit2/cmn/config-checksumEdward Thomson2015-11-024-36/+59
|\ \ \ \ | | | | | | | | | | Use checksums to detect config file changes
| * | | | filebuf: use an internal buffercmn/config-checksumCarlos Martín Nieto2015-10-301-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 changesCarlos Martín Nieto2015-10-303-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.
| * | | | config: add failing test for an external modificationCarlos Martín Nieto2015-10-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently use the timestamp in order to decide whether a config file has changed since we last read it. This scheme falls down if the file is written twice within the same second, as we fail to detect the file change after the first read in that second.
* | | | | Merge pull request #3495 from leoyanggit/fix_transport_buildEdward Thomson2015-11-021-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix build for custom transport users
| * | | | | Fix build for custom transport usersLeo Yang2015-10-301-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | We should explicitly include the declaration of git_strarray from "include/git2/sys/transport.h"
* | | | | Merge pull request #3492 from libgit2/vmg/redundantVicent Marti2015-11-0210-22/+202
|\ \ \ \ \ | |_|/ / / |/| | | | merge-base: Remove redundant merge bases