- 25 Nov, 2015 11 commits
-
-
Edward Thomson committed
-
When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.
Edward Thomson committed -
Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
Edward Thomson committed -
Edward Thomson committed
-
- 20 Nov, 2015 6 commits
-
-
Fix some warnings
Edward Thomson committed -
Stat fixes
Edward Thomson committed -
repository: distinguish sequencer cherry-pick and revert
Edward Thomson committed -
Jacques Germishuys committed
-
Jacques Germishuys committed
-
These are not quite like their plain counterparts and require special handling.
Carlos Martín Nieto committed
-
- 17 Nov, 2015 13 commits
-
-
Racy fixes for writing new indexes
Carlos Martín Nieto committed -
Protect windows SYSDIR when running tests
Carlos Martín Nieto committed -
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 committed -
Edward Thomson committed
-
Query the `GIT_CONFIG_LEVEL_PROGRAMDATA` location when setting it up for tests, in case the test runner has sandboxed it.
Edward Thomson committed -
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 committed -
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 committed -
Ensure that `git_index_read_tree` clears the uptodate bit on files that it modifies.
Edward Thomson committed -
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 committed -
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 committed -
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 committed -
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 committed -
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.
Edward Thomson committed
-
- 13 Nov, 2015 2 commits
-
-
pool: Never return unaligned buffers
Carlos Martín Nieto committed -
Vicent Marti committed
-
- 12 Nov, 2015 8 commits
-
-
git_index_entry__init_from_stat: set nsec fields in entry stats
Carlos Martín Nieto committed -
Improve error messages when dirs prevent ref/reflog creation
Carlos Martín Nieto committed -
Support setting custom user-agent
Carlos Martín Nieto committed -
Carlos Martín Nieto committed
-
We also keep the "git/1.0" prefix in order to maintain compatibility with hosters.
Carlos Martín Nieto committed -
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 committed -
Carlos Martín Nieto committed
-
Failing test for case sensitive conflicts in the index
Edward Thomson committed
-