summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Teach `git_patch_from_diff` about parsed diffsethomson/patch_from_diffEdward Thomson2016-08-241-0/+45
| | | | | Ensure that `git_patch_from_diff` can return the patch for parsed diffs, not just generate a patch for a generated diff.
* Merge pull request #3837 from novalis/dturner/indexv4Edward Thomson2016-08-172-0/+80
|\ | | | | Support index v4
| * index: support index v4David Turner2016-08-101-0/+41
| | | | | | | | | | | | | | Support reading and writing index v4. Index v4 uses a very simple compression scheme for pathnames, but is otherwise similar to index v3. Signed-off-by: David Turner <dturner@twitter.com>
| * varint: Add varint encoding/decodingDavid Turner2016-08-101-0/+39
| | | | | | | | | | | | | | This code is ported from git.git Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Turner <dturner@twopensource.com>
* | Merge pull request #3895 from pks-t/pks/negate-basename-in-subdirsEdward Thomson2016-08-171-0/+38
|\ \ | |/ |/| ignore: allow unignoring basenames in subdirectories
| * ignore: allow unignoring basenames in subdirectoriesPatrick Steinhardt2016-08-121-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .gitignore file allows for patterns which unignore previous ignore patterns. When unignoring a previous pattern, there are basically three cases how this is matched when no globbing is used: 1. when a previous file has been ignored, it can be unignored by using its exact name, e.g. foo/bar !foo/bar 2. when a file in a subdirectory has been ignored, it can be unignored by using its basename, e.g. foo/bar !bar 3. when all files with a basename are ignored, a specific file can be unignored again by specifying its path in a subdirectory, e.g. bar !foo/bar The first problem in libgit2 is that we did not correctly treat the second case. While we verified that the negative pattern matches the tail of the positive one, we did not verify if it only matches the basename of the positive pattern. So e.g. we would have also negated a pattern like foo/fruz_bar !bar Furthermore, we did not check for the third case, where a basename is being unignored in a certain subdirectory again. Both issues are fixed with this commit.
* | Merge pull request #3893 from pks-t/pks/remove-unused-test-cbEdward Thomson2016-08-091-16/+0
|\ \ | | | | | | tests: blob: remove unused callback function
| * | tests: blob: remove unused callback functionPatrick Steinhardt2016-08-091-16/+0
| |/
* | odb: actually insert the empty blob in testsethomson/empty_blobEdward Thomson2016-08-052-32/+34
| |
* | odb: only provide the empty treeEdward Thomson2016-08-051-14/+15
| | | | | | | | | | | | | | Only provide the empty tree internally, which matches git's behavior. If we provide the empty blob then any users trying to write it with libgit2 would omit it from actually landing in the odb, which appear to git proper as a broken repository (missing that object).
* | Merge pull request #3881 from pks-t/pks/fix-clar-suite-prefix-computationCarlos Martín Nieto2016-08-051-0/+6
|\ \ | |/ |/| clar: fix parsing of test suite prefixes
| * clar: fix parsing of test suite prefixesPatrick Steinhardt2016-08-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing in a specific suite which should be executed by clar via `-stest::suite`, we try to parse this string and then include all tests contained in this suite. This also includes all tests in sub-suites, e.g. 'test::suite::foo'. In the case where multiple suites start with the same _string_, for example 'test::foo' and 'test::foobar', we fail to distinguish this correctly. When passing in `-stest::foobar`, we wrongly determine that 'test::foo' is a prefix and try to execute all of its matching functions. But as no function will now match 'test::foobar', we simply execute nothing. To fix this, we instead have to check if the prefix is an actual suite prefix as opposed to a simple string prefix. We do so by by inspecting if the first two characters trailing the prefix are our suite delimiters '::', and only consider the filter as matching in this case.
* | odb: only freshen pack files every 2 secondsethomson/refresh_objectsEdward Thomson2016-08-041-0/+14
| | | | | | | | | | | | Since writing multiple objects may all already exist in a single packfile, avoid freshening that packfile repeatedly in a tight loop. Instead, only freshen pack files every 2 seconds.
* | odb: freshen existing objects when writingEdward Thomson2016-08-041-0/+79
| | | | | | | | | | | | When writing an object, we calculate its OID and see if it exists in the object database. If it does, we need to freshen the file that contains it.
* | Merge pull request #3850 from wildart/custom-tlsEdward Thomson2016-08-041-4/+0
|\ \ | |/ |/| Enable https transport for custom TLS streams
| * remove conditions that prevent use of custom TLS streamwildart2016-07-061-4/+0
| |
* | tests: use a `size_t`Edward Thomson2016-07-242-8/+6
| |
* | repo::open: remove dead code, free buffersEdward Thomson2016-07-242-256/+277
| |
* | Merge pull request #3851 from txdv/get-user-agentEdward Thomson2016-07-051-0/+6
|\ \ | | | | | | Add get user agent functionality.
| * | Add get user agent functionality.Andrius Bentkus2016-07-051-0/+6
| |/
* | Merge pull request #3846 from rkrp/fix_bug_parsing_int64minEdward Thomson2016-07-051-0/+8
|\ \ | |/ |/| Fixed bug while parsing INT64_MIN
| * Fixed bug while parsing INT64_MINKrishna Ram Prakash R2016-06-291-0/+8
| |
* | Merge pull request #3711 from joshtriplett/git_repository_discover_defaultEdward Thomson2016-07-012-2/+277
|\ \ | | | | | | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment vars
| * | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment varsJosh Triplett2016-06-241-0/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_repository_open_ext provides parameters for the start path, whether to search across filesystems, and what ceiling directories to stop at. git commands have standard environment variables and defaults for each of those, as well as various other parameters of the repository. To avoid duplicate environment variable handling in users of libgit2, add a GIT_REPOSITORY_OPEN_FROM_ENV flag, which makes git_repository_open_ext automatically handle the appropriate environment variables. Commands that intend to act just like those built into git itself can use this flag to get the expected default behavior. git_repository_open_ext with the GIT_REPOSITORY_OPEN_FROM_ENV flag respects $GIT_DIR, $GIT_DISCOVERY_ACROSS_FILESYSTEM, $GIT_CEILING_DIRECTORIES, $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and $GIT_ALTERNATE_OBJECT_DIRECTORIES. In the future, when libgit2 gets worktree support, git_repository_open_env will also respect $GIT_WORK_TREE and $GIT_COMMON_DIR; until then, git_repository_open_ext with this flag will error out if either $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
| * | Add GIT_REPOSITORY_OPEN_NO_DOTGIT flag to avoid appending /.gitJosh Triplett2016-06-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT_REPOSITORY_OPEN_NO_SEARCH does not search up through parent directories, but still tries the specified path both directly and with /.git appended. GIT_REPOSITORY_OPEN_BARE avoids appending /.git, but opens the repository in bare mode even if it has a working directory. To support the semantics git uses when given $GIT_DIR in the environment, provide a new GIT_REPOSITORY_OPEN_NO_DOTGIT flag to not try appending /.git.
| * | Fix repository discovery with ceiling_dirs at current directoryJosh Triplett2016-06-242-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git only checks ceiling directories when its search ascends to a parent directory. A ceiling directory matching the starting directory will not prevent git from finding a repository in the starting directory or a parent directory. libgit2 handled the former case correctly, but differed from git in the latter case: given a ceiling directory matching the starting directory, but no repository at the starting directory, libgit2 would stop the search at that point rather than finding a repository in a parent directory. Test case using git command-line tools: /tmp$ git init x Initialized empty Git repository in /tmp/x/.git/ /tmp$ cd x/ /tmp/x$ mkdir subdir /tmp/x$ cd subdir/ /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x git rev-parse --git-dir fatal: Not a git repository (or any of the parent directories): .git /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x/subdir git rev-parse --git-dir /tmp/x/.git Fix the testsuite to test this case (in one case fixing a test that depended on the current behavior), and then fix find_repo to handle this case correctly. In the process, simplify and document the logic in find_repo(): - Separate the concepts of "currently checking a .git directory" and "number of iterations left before going further counts as a search" into two separate variables, in_dot_git and min_iterations. - Move the logic to handle in_dot_git and append /.git to the top of the loop. - Only search ceiling_dirs and find ceiling_offset after running out of min_iterations; since ceiling_offset only tracks the longest matching ceiling directory, if ceiling_dirs contained both the current directory and a parent directory, this change makes find_repo stop the search at the parent directory.
* | | index: include conflicts in `git_index_read_index`ethomson/read_index_conflictsEdward Thomson2016-06-293-8/+112
| |/ |/| | | | | | | | | Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target.
* | Merge pull request #3223 from ethomson/applyEdward Thomson2016-06-2516-8/+2209
|\ \ | |/ |/| Reading patch files
| * patch: show copy information for identical copiesEdward Thomson2016-06-254-13/+98
| | | | | | | | | | | | | | When showing copy information because we are duplicating contents, for example, when performing a `diff --find-copies-harder -M100 -B100`, then show copy from/to lines in a patch, and do not show context. Ensure that we can also parse such patches.
| * patch::parse: test diff with exact rename and copyEdward Thomson2016-06-251-0/+5
| |
| * patch::parse: test diff with simple renameEdward Thomson2016-06-251-12/+27
| |
| * diff::parse tests: test parsing a diffEdward Thomson2016-06-253-0/+107
| | | | | | | | | | Test that we can create a diff file, then parse the results and that the two are identical in-memory.
| * introduce `git_diff_from_buffer` to parse diffsEdward Thomson2016-05-261-0/+60
| | | | | | | | Parse diff files into a `git_diff` structure.
| * patch: differentiate not found and invalid patchesEdward Thomson2016-05-261-6/+75
| |
| * git_patch_parse_ctx: refcount the contextEdward Thomson2016-05-263-0/+3
| |
| * git_diff_generated: abstract generated diffsEdward Thomson2016-05-263-0/+3
| |
| * vector: more sensible names for `grow_at`/`shrink_at`Edward Thomson2016-05-261-12/+12
| |
| * patch: `git_patch_from_patchfile` -> `git_patch_from_buffer`Edward Thomson2016-05-263-14/+17
| |
| * git_vector_grow/shrink: correct shrink, and testsEdward Thomson2016-05-261-0/+102
| |
| * apply: test postimages that grow/shrink originalEdward Thomson2016-05-262-0/+131
| | | | | | | | | | | | | | Test with some postimages that actually grow/shrink from the original, adding new lines or removing them. (Also do so without context to ensure that we can add/remove from a non-zero part of the line vector.)
| * git_buf_quote/unquote: handle > \177Edward Thomson2016-05-261-0/+5
| | | | | | | | | | | | Parse values up to and including `\377` (`0xff`) when unquoting. Print octal values as an unsigned char when quoting, lest `printf` think we're talking about negatives.
| * patch parsing: squash some memory leaksEdward Thomson2016-05-261-0/+2
| |
| * git_buf_quote: quote ugly charactersEdward Thomson2016-05-261-26/+52
| |
| * Introduce git_patch_options, handle prefixesEdward Thomson2016-05-263-41/+43
| | | | | | | | | | Handle prefixes (in terms of number of path components) for patch parsing.
| * patch_parse: test roundtrip patch parsing -> printEdward Thomson2016-05-261-0/+166
| |
| * patch_parse: ensure we can parse a patchEdward Thomson2016-05-261-0/+31
| |
| * apply: move patch data to patch_common.hEdward Thomson2016-05-263-2/+2
| |
| * patch: abstract patches into diff'ed and parsedEdward Thomson2016-05-261-0/+1
| | | | | | | | | | | | Patches can now come from a variety of sources - either internally generated (from diffing two commits) or as the results of parsing some external data.
| * patch parsing: ensure empty patches are illegalEdward Thomson2016-05-261-0/+8
| |
| * patch parsing: parse binary patch filesEdward Thomson2016-05-261-55/+123
| |
View Lorry Controller Status