summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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-246-71/+95
|\ \ \ \ | |/ / / |/| | | Stash workdir correctly when added in the index, modified in the workdir
| * | | stash: save the workdir file when deleted in indexEdward Thomson2015-06-233-14/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stashing the workdir tree, examine the index as well. Using a mechanism similar to `git_diff_tree_to_workdir_with_index` allows us to determine that a file was added in the index and subsequently modified in the working directory. Without examining the index, we would erroneously believe that this file was untracked and fail to include it in the working directory tree. Use a slightly modified `git_diff_tree_to_workdir_with_index` in order to avoid some of the behavior custom to `git diff`. In particular, be sure to include the working directory side of a file when it was deleted in the index.
| * | | 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.
| * | | git_diff__merge: allow pluggable diff mergesEdward Thomson2015-06-232-3/+19
| | | |
| * | | diff_tform: remove reversed copy of delta mergerEdward Thomson2015-06-231-46/+7
| | |/ | |/| | | | | | | | | | Drop `git_diff__merge_like_cgit_reversed`, since it's a copy and paste mess of slightly incompatible changes.
* | | Merge pull request #3251 from git-up/fixesEdward Thomson2015-06-242-3/+3
|\ \ \ | | | | | | | | Fixes
| * | | Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
| | | |
| * | | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-231-2/+2
|/ / /
* | | Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-232-3/+34
|\ \ \ | | | | | | | | Fixed GIT_DELTA_CONFLICTED not returned in some cases
| * | | Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-232-3/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | 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 #3131 from urkud/const-charEdward Thomson2015-06-231-1/+1
|\ \ \ | | | | | | | | Add `const` qualifier
| * | | Add `const` qualifierYury G. Kudryashov2015-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a warning in `examples/describe.c` without breaking the main build. OTOH, I'm not sure if this is an API-compatible change.
* | | | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-2310-45/+229
|\ \ \ \ | | | | | | | | | | racy-git, the missing link
| * | | | Add a note about racy-git in CHANGELOGcmn/racy-diff-againCarlos Martín Nieto2015-06-221-0/+3
| | | | |
| * | | | 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
| | | | |
| * | | | index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-226-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #3249 from libgit2/cmn/repo-version-checkEdward Thomson2015-06-232-11/+50
|\ \ \ \ \ | |_|_|/ / |/| | | | Check the repository version
| * | | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-232-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | repository: don't error out if there is no versionCarlos Martín Nieto2015-06-231-2/+7
|/ / / / | | | | | | | | | | | | | | | | git will assume the repository format version is 0 if the value is not there. Do the same.
* | | | Merge pull request #3228 from git-up/diff_mergeCarlos Martín Nieto2015-06-232-0/+47
|\ \ \ \ | | | | | | | | | | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
| * | | | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-222-0/+47
|/ / / / | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #3199 from ethomson/crlfCarlos Martín Nieto2015-06-221408-132/+8265
|\ \ \ \ | | | | | | | | | | CRLF
| * | | | crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Perform LF->CRLF for core.autocrlf=true on non-Win32 because core git does.
| * | | | 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-223-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Allow files to have mixed line endings instead of skipping processing on them.
| * | | | crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Use statistics (like core git) to control the behavior of the to workdir CRLF filter.
| * | | | 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.
* | | | Merge pull request #3240 from libgit2/cmn/commit-header-fieldEdward Thomson2015-06-224-0/+107
|\ \ \ \ | |_|_|/ |/| | | commit: allow retrieving an arbitrary header field
| * | | commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-224-0/+107
| |/ / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #3239 from git-up/stash_indexCarlos Martín Nieto2015-06-221-0/+2
|\ \ \ | |/ / |/| | Write modified index in git_stash_apply()
| * | Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/ / | | | | | | | | Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.
* | Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\ \ | | | | | | Don't propagate workdir's mode to the index during diff's update index
| * | diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| | | | | | | | | | | | | | | | | | | | | 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.)
| * | 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-206-16/+63
|\ \ \ | |/ / |/| | Use the checksum to check whether an index has been modified
View Lorry Controller Status