summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* binary diff: test that the diff and patch otputs are the samecmn/diff-binary-patchCarlos Martín Nieto2015-06-241-0/+7
| | | | | | | | 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.
* Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-231-2/+2
|
* Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-1/+30
|\ | | | | Fixed GIT_DELTA_CONFLICTED not returned in some cases
| * Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-1/+30
| | | | | | | | | | | | | | | | 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.
* | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-235-40/+161
|\ \ | | | | | | racy-git, the missing link
| * | index: add a diff test for smudging a file which becomes emptyCarlos Martín Nieto2015-06-221-0/+43
| | | | | | | | | | | | | | | Even though the file is empty and thus the size in the entry matches, we should be able to detect it as a difference.
| * | tests: move racy tests to the indexCarlos Martín Nieto2015-06-221-4/+4
| | | | | | | | | | | | | | | They fit there much better, even though we often check by diffing, it's about the behaviour of the index.
| * | merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | tests: set racy times manuallyCarlos Martín Nieto2015-06-221-6/+26
| | |
| * | tests: plug leaks in the racy testCarlos Martín Nieto2015-06-221-1/+9
| | |
| * | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-223-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-231-0/+17
| |/ |/| | | | | | | | | | | | | 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.
* | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-221-0/+36
| | | | | | | | | | 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.
* | crlf tests: ensure that Unix obeys autocrlf=trueEdward Thomson2015-06-222-60/+17
| | | | | | | | | | All platforms do terrible, horrible, no good, very bad translation when core.autocrlf=true. It's not just Windows!
* | git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-221-8/+31
| | | | | | | | | | Allow files to have mixed line endings instead of skipping processing on them.
* | clar: support hierarchical test resource dataEdward Thomson2015-06-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | crlf tests: posix known-good dataEdward Thomson2015-06-22684-0/+3960
| | | | | | | | | | 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.
* | crlf tests: windows known-good dataEdward Thomson2015-06-22685-0/+3961
| | | | | | | | | | | | 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.
* | crlf tests: use known-good data produced by gitEdward Thomson2015-06-221-36/+156
| | | | | | | | | | | | 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.
* | crlf: script to generate expected crlf dataEdward Thomson2015-06-221-0/+73
| | | | | | | | | | | | 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.
* | crlf: include utf8 resources in master branchEdward Thomson2015-06-2218-9/+11
| | | | | | | | | | Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness.
* | crlf: include additional test resourcesEdward Thomson2015-06-2216-1/+6
| | | | | | | | | | Include additional test data for CRLF tests: files with mixed line endings and binary files.
* | commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-221-0/+38
|/ | | | | | 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.
* status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
| | | | | | 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).
* Merge pull request #3238 from git-up/double_freeEdward Thomson2015-06-201-2/+0
|\ | | | | Fixed index being double-freed in stash tests
| * Fixed index being double-freed in stash testsPierre-Olivier Latour2015-06-201-2/+0
| |
* | Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-201-2/+2
|\ \ | |/ |/| Use the checksum to check whether an index has been modified
| * index: user a better assertion when comparing sizesCarlos Martín Nieto2015-06-191-2/+2
| | | | | | | | | | This will tell us which numbers we were trying to compare, rather than just telling us that they're different.
* | tests: tick over five seconds instead of oneCarlos Martín Nieto2015-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When ticking over one second, it can happen that the actual time ticks over the same second between the time that we undermine our own race protections and the time in which we perform the index update. Such timing would make the time in the entries match the index' timestamp and we have not gained anything. Ticking over five seconds makes it so that if real-time rolls over that second, our index is still ahead. This is still suboptimal as we're dealing with timing, but five seconds should be long enough for any reasonable test runner to finish the tests.
* | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-171-1/+0
| |
* | Fix memory leak in tests/network/refspecs.cJeff Hostetler2015-06-171-0/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-178-4/+143
|\ | | | | Zero out racily-clean entries' file_size
| * merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
| |
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-162-5/+56
| | | | | | | | | | | | Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-165-19/+34
| | | | | | | | | | | | | | | | | | These tests want to test that we don't recalculate entries which match the index already. This is however something we force when truncating racily-clean entries. Tick the index forward as we know that we don't perform the modifications which the racily-clean code is trying to avoid.
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-161-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid racy-git, we zero out the file size for entries with the same timestamp as the index (or during the initial checkout). This is the case in a couple of crlf tests, as the code is fast enough to do everything in the same second. As we know that we do not perform the modification just after writing out the index, which is what this is designed to work around, tick the mtime of the index file such that it doesn't agree with the files anymore, and we do not zero out these entries.
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
| | | | | | | | | | | | | | | | | | | | | | We update the index and then immediately change the contents of the file. This makes the diff think there are no changes, as the timestamp of the file agrees with the cached data. This is however a bug, as the file has obviously changed contents. The test is a bit fragile, as it assumes that the index writing and the following modification of the file happen in the same second, but it's enough to show the issue.
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-161-0/+7
|\ \ | | | | | | commit: ignore multiple author fields
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tools create multiple author fields. git is rather lax when parsing them, although fsck does complain about them. This means that they exist in the wild. As it's not too taxing to check for them, and there shouldn't be a noticeable slowdown when dealing with correct commits, add logic to skip over these extra fields when parsing the commit.
* | | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-153-12/+20
| |/ |/|
* | Merge pull request #3177 from ethomson/binary_diffCarlos Martín Nieto2015-06-1511-167/+415
|\ \ | | | | | | Binary diffs: store deltas in the diff structure, include binary data in diff callbacks
| * | binary diff: test binary blob to blob testsEdward Thomson2015-06-121-0/+130
| | |
| * | diff: introduce binary diff callbacksEdward Thomson2015-06-1210-167/+186
| | | | | | | | | | | | | | | | | | | | | Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB.
| * | binary diff: test index->workdir binary diffsEdward Thomson2015-06-121-0/+99
| | |
* | | Merge pull request #3217 from jeffhostetler/leak_checkout_icaseCarlos Martín Nieto2015-06-151-0/+2
|\ \ \ | |/ / |/| | Fix leaks in tests/checkout/icase
| * | Fix leaks in tests/checkout/icaseJeff Hostetler2015-06-121-0/+2
| | |
* | | clone: set the credentials callback during testingcmn/push-testsCarlos Martín Nieto2015-06-121-0/+1
| | |
* | | push: pass the callbacks during setup as wellCarlos Martín Nieto2015-06-121-3/+7
| |/ |/| | | | | | | We need to pass these options in order to have the credentials callback set.
* | Introduce `git_filter_list_contains`Edward Thomson2015-06-101-0/+91
|/ | | | | `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.
* Merge pull request #3165 from ethomson/downcaseCarlos Martín Nieto2015-06-081-0/+42
|\ | | | | Downcase
View Lorry Controller Status