summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-253-11/+11
| | | | | Fallback describes the mechanism, while unspecified explains what the user is thinking.
* Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-248-236/+141
|\ | | | | Remove run-time configuration settings from submodules
| * submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
| | | | | | | | | | | | In addition to mapping enums to strings in the configuration, we need to know to delete the configuration option when given the "none" or "no" option.
| * submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
| | | | | | | | | | | | The current code will always fail, but only because it's asking for a string on a live config. Take a snapshot and make sure we fail with ENOTFOUND instead of any old error.
| * submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
| |
| * submodule: get rid of `_save()`Carlos Martín Nieto2015-06-221-9/+0
| | | | | | | | | | We no longer have any setters which affect an instance, so `git_submodule_save()` is no longer relevant.
| * submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-222-42/+9
| | | | | | | | With this one, we can get rid of the edit_and_save test.
| * submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-221-14/+20
| |
| * submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-221-28/+16
| | | | | | | | | | | | Similarly to the other ones. In this test we copy over testing `RECURSE_YES` which shows an error in our handling of the `YES` variant which we may have to port to the rest.
| * submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-221-21/+11
| | | | | | | | | | Moving on with the removal of runtime-changing variables, the update setting for a remote is whatever it was when it was looked up.
| * submodule: add an ignore option to statusCarlos Martín Nieto2015-06-224-49/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | This lets us specify in the status call which ignore rules we want to use (optionally falling back to whatever the submodule has in its configuration). This removes one of the reasons for having `_set_ignore()` set the value in-memory. We re-use the `IGNORE_RESET` value for this as it is no longer relevant but has a similar purpose to `IGNORE_FALLBACK`. Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of initializers and move that to fall back to the configuration as well.
| * submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-222-14/+24
| | | | | | | | | | | | As submodules are becomes more like values, we should not let a status check to update its properties. Instead of taking a submodule, have status take a repo and submodule name.
| * submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-223-25/+20
| | | | | | | | | | Instead of affecting a particular instance, make it change the configuration.
| * submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-222-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Having this cache and giving them out goes against our multithreading guarantees and it makes it impossible to use submodules in a multi-threaded environment, as any thread can ask for a refresh which may reallocate some string in the submodule struct which we've accessed in a different one via a getter. This makes the submodules behave more like remotes, where each object is created upon request and not shared except explicitly by the user. This means that some tests won't pass yet, as they assume they can affect the submodule objects in the cache and that will affect later operations.
* | Merge pull request #3254 from ethomson/diff-binary-patchCarlos Martín Nieto2015-06-241-0/+37
|\ \ | | | | | | Handle binary DIFFABLEness properly
| * | diff::binary tests: empty diff when forced binaryEdward Thomson2015-06-241-0/+30
| | | | | | | | | | | | | | | | | | Ensure that even when we're forcing a binary diff that we do not assume that there *is* a diff. There should be an empty diff for no change.
| * | 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.
* | | Merge pull request #3250 from ethomson/stashCarlos Martín Nieto2015-06-243-11/+26
|\ \ \ | |/ / |/| | Stash workdir correctly when added in the index, modified in the workdir
| * | stash tests: ensure we save the workdir fileEdward Thomson2015-06-233-11/+26
| | | | | | | | | | | | | | | | | | Ensure that when a file is added in the index and subsequently modified in the working directory, the stashed working directory tree contains the actual working directory contents.
* | | 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
View Lorry Controller Status