Log

Author Commit Date CI Message
Edward Thomson b1eef912 2015-10-27T18:00:30 merge: add recursive test with conflicting contents
Edward Thomson 1b82f7b6 2015-10-27T14:24:51 merge: compute octopus merge bases
Edward Thomson fccad82e 2015-10-27T14:23:35 merge: add recursive test with three merge bases
Edward Thomson 99d9d9a4 2015-10-26T17:44:36 merge: improve test names in recursive merge tests
Edward Thomson a200bcf7 2015-10-26T17:25:42 merge: add a third-level recursive merge
Edward Thomson cdb6c1c8 2015-10-26T17:14:28 merge: add a second-level recursive merge
Edward Thomson 75dee59c 2015-10-26T10:37:58 merge: build virtual base of multiple merge bases When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.
Edward Thomson 86c8d02c 2015-10-22T20:20:07 merge: add simple recursive test Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
Edward Thomson fa78782f 2015-10-22T17:00:09 merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
Edward Thomson c4f60543 2015-11-20T17:57:04 Merge pull request #3517 from jacquesg/warnings-fixes Fix some warnings
Edward Thomson 7a612b53 2015-11-20T17:52:00 Merge pull request #3514 from jacquesg/stat-fixes Stat fixes
Edward Thomson 1f6c891e 2015-11-20T15:38:33 Merge pull request #3516 from libgit2/cmn/repository-state-sequencer repository: distinguish sequencer cherry-pick and revert
Jacques Germishuys eb11fac6 2015-11-20T18:57:13 Detect stat's structure
Jacques Germishuys 87428c55 2015-11-20T20:48:51 Fix some warnings
Carlos Martín Nieto 2ea40fda 2015-11-20T13:19:23 repository: distinguish sequencer cherry-pick and revert These are not quite like their plain counterparts and require special handling.
Carlos Martín Nieto 69d14948 2015-11-17T13:21:18 Merge pull request #3511 from ethomson/racy_fixes_2 Racy fixes for writing new indexes
Carlos Martín Nieto 41744745 2015-11-17T13:20:48 Merge pull request #3512 from ethomson/windows_sysdir Protect windows SYSDIR when running tests
Edward Thomson 88638f9b 2015-11-17T11:22:01 tests: use out-of-the-way config dir in sandbox Don't put the configuration in a subdir of the sandbox named `config`, lest some tests decide to create their own directory called `config`. Prefix with some underscores for uniqueness.
Edward Thomson fe963748 2015-11-16T23:34:26 tests: set PROGRAMDATA directory for running tests
Edward Thomson 6f7c4118 2015-11-17T08:38:46 config::global: use PROGRAMDATA configuration Query the `GIT_CONFIG_LEVEL_PROGRAMDATA` location when setting it up for tests, in case the test runner has sandboxed it.
Edward Thomson 3eac1037 2015-11-16T23:31:19 settings: allow users to set PROGRAMDATA Allow users to set the `git_libgit2_opts` search path for the `GIT_CONFIG_LEVEL_PROGRAMDATA`. Convert `GIT_CONFIG_LEVEL_PROGRAMDATA` to `GIT_SYSDIR_PROGRAMDATA` for setting the configuration.
Edward Thomson 5f32c506 2015-11-16T18:06:52 racy: make git_index_read_index handle raciness Ensure that `git_index_read_index` clears the uptodate bit on files that it modifies. Further, do not propagate the cache from an on-disk index into another on-disk index. Although this should not be done, as `git_index_read_index` is used to bring an in-memory index into another index (that may or may not be on-disk), ensure that we do not accidentally bring in these bits when misused.
Edward Thomson c30051f0 2015-11-16T18:05:46 racy: ensure git_index_read_tree clears uptodate Ensure that `git_index_read_tree` clears the uptodate bit on files that it modifies.
Edward Thomson 27bc41cf 2015-11-13T16:31:51 index: clear uptodate bit on save The uptodate bit should have a lifecycle of a single read->write on the index. Once the index is written, the files within it should be scanned for racy timestamps against the new index timestamp.
Edward Thomson 956f4da8 2015-11-13T16:30:39 index: test for smudged entries on write only Test that entries are only smudged when we write the index: the entry smudging is to prevent us from updating an index in a way that it would be impossible to tell that an item was racy. Consider when we load an index: any entries that have the same (or newer) timestamp than the index itself are considered racy, and are subject to further scrutiny. If we *save* that index with the same entries that we loaded, then the index would now have a newer timestamp than the entries, and they would no longer be given that additional scrutiny, failing our racy detection! So test that we smudge those entries only on writing the new index, but that we can detect them (in diff) without having to write.
Edward Thomson de999f26 2015-11-13T15:36:45 checkout::crlf test: don't crash when no idx entry When there's no matching index entry (for whatever reason), don't try to dereference the null return value to get at the id. Otherwise when we break something in the index API, the checkout test crashes for confusing reasons and causes us to step through it in a debugger thinking that we had broken much more than we actually did.
Edward Thomson d1101263 2015-11-13T15:32:48 index: don't detect raciness in uptodate entries Keep track of entries that we believe are up-to-date, because we added the index entries since the index was loaded. This prevents us from unnecessarily examining files that we wrote during the cleanup of racy entries (when we smudge racily clean files that have a timestamp newer than or equal to the index's timestamp when we read it). Without keeping track of this, we would examine every file that we just checked out for raciness, since all their timestamps would be newer than the index's timestamp.
Edward Thomson cb0ff012 2015-11-06T17:15:35 racy-git: do a single index->workdir diff When examining paths that are racily clean, do a single index->workdir diff over the entirety of the racily clean files, instead of a diff per file.
Carlos Martín Nieto 32b9e647 2015-11-13T05:41:18 Merge pull request #3506 from libgit2/vmg/pool-align pool: Never return unaligned buffers
Vicent Marti 7ff7ca62 2015-11-12T20:51:01 pool: Never return unaligned buffers
Carlos Martín Nieto 75a0ccf5 2015-11-12T19:53:09 Merge pull request #3170 from CmdrMoozy/nsec_fix git_index_entry__init_from_stat: set nsec fields in entry stats
Carlos Martín Nieto 2c26c867 2015-11-12T19:22:31 Merge pull request #3499 from ethomson/ref_dir_errmsgs Improve error messages when dirs prevent ref/reflog creation
Carlos Martín Nieto ecdc0428 2015-11-12T19:20:36 Merge pull request #3448 from libgit2/cmn/custom-agent Support setting custom user-agent
Carlos Martín Nieto 027bbaa7 2015-11-12T17:20:30 CHANGELOG: add note about custom user-agent
Carlos Martín Nieto 1411cb9e 2015-10-02T03:57:14 winhttp: use a custom user-agent if the user has set it We also keep the "git/1.0" prefix in order to maintain compatibility with hosters.
Carlos Martín Nieto 94bac76c 2015-10-02T03:46:34 http: use a custom user-agent if the user has set it We still prefix it with "git/1.0" since that's required in many situations, but we replace the area which mentions libgit2.
Carlos Martín Nieto de870533 2015-10-02T03:43:11 settings: add a setter for a custom user-agent
Edward Thomson 3f5877d1 2015-11-12T10:13:11 Merge pull request #2534 from libgit2/ntk/case_index_conflicts Failing test for case sensitive conflicts in the index
Edward Thomson 0a700ee3 2015-11-03T17:34:54 reflog: error when a directory is at reflog path When a non-empty directory exists and prevents the creation of a reflog, provide a more informative error message.
Edward Thomson b46c7ee5 2015-11-03T17:18:00 refs: complain when a directory exists at ref When a (non-empty) directory exists at the reference target location, complain with a more actionable error message.
Carlos Martín Nieto ad8509ef 2015-11-12T11:54:06 index: overwrite the path when inserting conflicts 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.
Carlos Martín Nieto 16604d74 2015-11-11T00:36:15 index: correctly report which conflict stage has a wrong filemode When we're at offset 'i', we're dealing with the 'i+1' stage, since conflicts start at 1.
nulltoken 1314af8d 2014-08-26T13:51:37 Failing test for case sensitive conflicts in the index
Carlos Martín Nieto 1c34b717 2015-11-08T05:10:18 Merge pull request #3498 from ethomson/windows_symlinks Diff: Honor `core.symlinks=false` and fake symlinks
Carlos Martín Nieto 61948894 2015-11-08T04:54:55 Merge pull request #3500 from ethomson/submodules_with_path Handle submodules with paths in `git_submodule_update`
Edward Thomson f4b02671 2015-11-04T16:17:51 submodule: reload HEAD/index after reading config 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.
Edward Thomson 790012ce 2015-11-04T16:16:51 submodule: test updating a submodule w/ a path Test that `git_submodule_update` can handle a submodule that is freshly cloned and has a path differing from its name.
Edward Thomson 5aa28a8f 2015-11-04T14:16:24 Merge pull request #3465 from libgit2/cmn/tls-register stream: allow registering a user-provided TLS constructor
Edward Thomson 610e553f 2015-11-03T17:52:21 Merge branch 'pr/3487'
Stjepan Rajko f5f96a23 2015-10-09T10:41:06 Fix git_commit_summary to convert newlines to spaces even after whitespace. Collapse spaces around newlines for the summary.
Edward Thomson ec50b23a 2015-11-03T17:02:07 filebuf: detect directories in our way 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.
Edward Thomson 2d556f31 2015-11-03T14:48:31 reflog: test reflog is deleted when ref is deleted
Edward Thomson 6cc5023b 2015-11-03T11:27:31 index: test that add_bypath preserves symlinks 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.)
Edward Thomson 6b0fc6ab 2015-11-03T09:43:18 diff: on win32, treat fake "symlinks" specially 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.
Edward Thomson f20480ab 2015-11-03T09:40:30 diff: test "symlinks" in wd are respected on win32 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).
Carlos Martín Nieto 3ce6cd4b 2015-11-03T08:13:41 Merge pull request #3494 from leoyanggit/fix_unit_test_build Fix build for unit test
Carlos Martín Nieto 7fafde63 2015-10-13T11:25:41 stream: allow registering a user-provided TLS constructor This allows the application to use their own TLS stream, regardless of the capabilities of libgit2 itself.
Carlos Martín Nieto d39f643a 2015-10-13T19:34:07 stream: accept NULL in the free function
Edward Thomson d07c9f4d 2015-11-02T16:36:28 Merge branch 'pr/3147'
Jason Haslam 3138ad93 2015-07-16T10:17:16 Add diff progress callback.
Leo Yang 505e4531 2015-10-30T13:53:53 Fix build for unit test If none of GIT_OPENSSL, GIT_WINHTTP or GIT_SECURE_TRANSPORT is defined we should also be able to build the unit test.
Edward Thomson db1edf91 2015-11-02T15:09:19 Merge pull request #3491 from libgit2/cmn/config-checksum Use checksums to detect config file changes
Edward Thomson 76319fa8 2015-11-02T15:04:26 Merge pull request #3495 from leoyanggit/fix_transport_build Fix build for custom transport users
Vicent Marti 1318ec91 2015-11-02T14:27:10 Merge pull request #3492 from libgit2/vmg/redundant merge-base: Remove redundant merge bases
Vicent Marti b656e5eb 2015-11-02T12:06:50 merge: Fix memory leak in test
Vicent Marti 85196232 2015-10-30T18:32:34 Add test case
Vicent Marti 1d0bed9d 2015-10-30T14:02:01 merge-base: Style
Vicent Marti 4cacf5b5 2015-10-30T11:50:43 merge-base: Do not read parents from the root
Vicent Marti 136a71f4 2015-10-30T11:45:52 merge-base: Remove redundant merge bases
Carlos Martín Nieto 3547b122 2015-10-30T21:36:51 filebuf: use an internal buffer 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.
Carlos Martín Nieto eb597799 2015-10-29T21:12:37 filebuf: use a checksum to detect file changes 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.
Carlos Martín Nieto a2f96479 2015-10-29T20:31:25 config: add failing test for an external modification 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.
Carlos Martín Nieto d571a54e 2015-10-30T19:36:16 Merge pull request #3493 from ethomson/read_index index: read_index must update hashes
Leo Yang bf28da47 2015-10-30T14:12:19 Fix build for custom transport users We should explicitly include the declaration of git_strarray from "include/git2/sys/transport.h"
Carlos Martín Nieto e0be1d60 2015-10-30T18:23:17 git: put NULL check at the top
Edward Thomson 0bf77e32 2015-10-30T13:07:02 index: read_index must update hashes
Carlos Martín Nieto 45d295e0 2015-10-30T17:51:50 git: accept NULL as argument to its stream free
Carlos Martín Nieto fd74bd08 2015-10-29T20:37:48 Merge pull request #3486 from srajko/reflog-segfault-fix Fix segfault when reading reflog with extra newlines
Stjepan Rajko 335c9e2f 2015-10-26T15:33:00 Prevent segfault when parsing a reflog with oid parse error 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
Edward Thomson 1b4449b4 2015-10-28T10:53:03 pool: fix documentation
Vicent Marti 232a7e32 2015-10-28T15:34:16 Merge pull request #3488 from libgit2/vmg/pool pool: Simplify implementation
Vicent Marti d845abe6 2015-10-28T14:49:28 merge: Do not mallocz unecessary entries
Vicent Marti 340b15b7 2015-10-28T14:31:09 pool: update comment
Vicent Marti d3416dfe 2015-10-28T10:50:25 pool: Dot not assume mallocs are zeroed out
Vicent Marti 66eb7660 2015-10-28T10:29:00 pool: Handle 32 bit systems
Vicent Marti 410efda8 2015-10-28T10:28:43 pool: Take into account malloc overhead & pool page size
Vicent Marti 4f971852 2015-10-28T10:15:24 repository: plug memory leak cc @carlosmn
Vicent Marti 1e5e02b4 2015-10-27T17:26:04 pool: Simplify implementation
Vicent Marti efc659b0 2015-10-28T09:55:20 Merge pull request #3489 from libgit2/vmg/reuc-insert Better REUC generation when merging
Vicent Marti 7a02e93e 2015-10-27T22:42:40 merge: Plug memory leak
Vicent Marti a1f5d691 2015-10-27T22:42:15 merge: Implement `GIT_MERGE_TREE_SKIP_REUC`
Vicent Marti d307a013 2015-10-27T22:17:32 reuc: Be smarter when inserting new REUC entries Inserting new REUC entries can quickly become pathological given that each insert unsorts the REUC vector, and both subsequent lookups *and* insertions will require sorting it again before being successful. To avoid this, we're switching to `git_vector_insert_sorted`: this keeps the REUC vector constantly sorted and lets us use the `on_dup` callback to skip an extra binary search on each insertion.
Carlos Martín Nieto 2382d1bc 2015-10-26T21:13:54 Merge pull request #3485 from srajko/giterr_clear-typo-fix Fix docs typo geterr_clear -> giterr_clear
Stjepan Rajko 2b96b6ef 2015-10-14T09:41:27 Fix docs typo geterr_clear -> giterr_clear
Edward Thomson 821131fd 2015-10-23T10:13:14 Merge pull request #3477 from linquize/inttypes.h inttypes.h is built-in header file since MSVC 2013
Carlos Martín Nieto 979a5c12 2015-10-23T15:16:21 Merge pull request #3483 from ethomson/cmake_xcode cmake: split sources into original paths for Xcode and MSVC
Carlos Martín Nieto e324005e 2015-10-23T15:13:38 Merge pull request #3481 from ethomson/xdiff_include xdiff: reference util.h in parent directory
Vicent Marti 7c0c21c3 2015-10-23T13:37:02 Merge pull request #3482 from ethomson/merge_fail_on_conflict merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
Edward Thomson 7208ff4d 2015-10-22T20:17:19 cmake: split sources into original paths for Xcode and MSVC The MSVC_SPLIT_SOURCES function is helpful for other IDEs, like Xcode, and will split the source files up into their target directories, instead of merely placing them all in a "Sources" directory. Rename MSVC_SPLIT_SOURCES to IDE_SPLIT_SOURCES and enable it for Xcode.
Edward Thomson 8683d31f 2015-10-22T14:39:20 merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.