- Jun 24, 2015
-
-
Carlos Martín Nieto authored
We test the generation of the textual patch via the patch function, which are just one of two possibilities to get the output. Add a second patch generation via the diff function to make sure both outputs are in sync.
-
Edward Thomson authored
Fixes
-
Pierre-Olivier Latour authored
-
Pierre-Olivier Latour authored
-
Edward Thomson authored
Fixed GIT_DELTA_CONFLICTED not returned in some cases
-
Edward Thomson authored
Add `const` qualifier
-
Edward Thomson authored
racy-git, the missing link
-
Edward Thomson authored
Check the repository version
-
Carlos Martín Nieto authored
This is something we do on re-init but not when opening a repository. This hasn't particularly mattered up to now as the version has been 0 ever since the first release of git, but the times, they're a-changing and we will soon see version 1 in the wild. We need to make sure we don't open those.
-
Carlos Martín Nieto authored
git will assume the repository format version is 0 if the value is not there. Do the same.
-
- Jun 23, 2015
-
-
Pierre-Olivier Latour authored
If an index entry for a file that is not in HEAD is in conflicted state, when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED. This was due to handle_unmatched_new_item() initially setting the status to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED.
-
Carlos Martín Nieto authored
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
-
Pierre-Olivier Latour authored
This fixes a bug where if a file was in conflicted state in either diff, it would not always remain in conflicted state in the merged diff.
-
Carlos Martín Nieto authored
CRLF
-
Edward Thomson authored
Perform LF->CRLF for core.autocrlf=true on non-Win32 because core git does.
-
Edward Thomson authored
All platforms do terrible, horrible, no good, very bad translation when core.autocrlf=true. It's not just Windows!
-
Edward Thomson authored
Allow files to have mixed line endings instead of skipping processing on them.
-
Edward Thomson authored
Use statistics (like core git) to control the behavior of the to workdir CRLF filter.
-
Edward Thomson authored
Support hierarchical test resource data, such that you can have `tests/resources/foo/bar` and move the `bar` directory in as a fixture. Calling `cl_fixture_sandbox` on a path that is not directly beneath the test resources directory succeeds, placing that directory into the test fixture. (For example, `cl_fixture_sandbox("foo/bar")` will sandbox the `foo/bar` directory as `bar`). Add support for cleaning up directories created this way, by only cleaning up the basename (in this example, `bar`) from the fixture directory.
-
Edward Thomson authored
A corpus of files checked out with Git (Linux, 1.9.1) to ensure that produce identical data when checking out using a CRLF filter.
-
Edward Thomson authored
A corpus of files checked out with Git for Windows (2.4.1.windows.1) to ensure that we produce identical data when checking out using a CRLF filter.
-
Edward Thomson authored
Given a variety of combinations of core.autocrlf settings and attributes settings, test that we check out data into the working directory the same as a known-good test resource created by git.git.
-
- Jun 22, 2015
-
-
Edward Thomson authored
Include a shell script that will generate the expected CRLF data, calling git.git to capture its output as a test resource for the current platform.
-
Edward Thomson authored
Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness.
-
Edward Thomson authored
Include additional test data for CRLF tests: files with mixed line endings and binary files.
-
Edward Thomson authored
commit: allow retrieving an arbitrary header field
-
Carlos Martín Nieto authored
Write modified index in git_stash_apply()
-
Carlos Martín Nieto authored
-
Carlos Martín Nieto authored
Even though the file is empty and thus the size in the entry matches, we should be able to detect it as a difference.
-
Carlos Martín Nieto authored
They fit there much better, even though we often check by diffing, it's about the behaviour of the index.
-
Carlos Martín Nieto authored
As we attempt to replicate a situation in which an older checkout has put a file on disk with different filtering settings from us, set the timestamp on the entry and file to a second before we're performing the operation so the entry in the index counts as old. This way we can test that we're not looking at the on-disk file when the index has the entry and we detect it as clean.
-
Carlos Martín Nieto authored
This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.
-
Carlos Martín Nieto authored
-
Carlos Martín Nieto authored
-
Carlos Martín Nieto authored
When an entry has a racy timestamp, we need to check whether the file itself has changed since we put its entry in the index. Only then do we smudge the size field to force a check the next time around.
-
Carlos Martín Nieto authored
When a file on the workdir has the same or a newer timestamp than the index, we need to perform a full check of the contents, as the update of the file may have happened just after we wrote the index. The iterator changes are such that we can reach inside the workdir iterator from the diff, though it may be better to have an accessor instead of moving these structs into the header.
-
- Jun 21, 2015
-
-
Pierre-Olivier Latour authored
Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.
-
Carlos Martín Nieto authored
Don't propagate workdir's mode to the index during diff's update index
-
Edward Thomson authored
When updating the index during a diff, preserve the original mode, which prevents us from dropping the mode to what we have interpreted as on our system (eg, what the working directory claims it to be, which may be a lie on some systems.)
-
Edward Thomson authored
Test to ensure that when status updates an index, it does not alter the original mode for file types that are not supported (eg, symlinks on Windows).
-