summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | rebase: init and open take a rebase_optionsEdward Thomson2015-04-204-76/+49
| | | | | | | | | | | | | | | | | | | | | | | | `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
| * | | rebase: take `checkout_options` where appropriateEdward Thomson2015-04-204-22/+22
| | | |
| * | | rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-201-0/+35
| | | |
| * | | rebase: commit should return GIT_EUNMERGEDEdward Thomson2015-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
| * | | rebase: identify a rebase that has not startedEdward Thomson2015-04-201-1/+1
| | |/ | |/| | | | | | | | | | | | | In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
* | | config_file: comment char can be invalid escapeEdward Thomson2015-04-201-0/+11
| | | | | | | | | | | | | | | | | | Don't assume that comment chars are comment chars, they may be (an attempt to be escaped). If so, \; is not a valid escape sequence, complain.
* | | config_file: parse multilines generouslyEdward Thomson2015-04-201-6/+34
|/ / | | | | | | | | Combine unquoting and multiline detection to avoid ambiguity when parsing.
* | Merge pull request #3016 from pks-t/ignore-exclude-fixEdward Thomson2015-04-171-0/+53
|\ \ | | | | | | ignore: fix negative ignores without wildcards.
| * | ignore: fix negative ignores without wildcards.Patrick Steinhardt2015-04-171-0/+53
| | |
* | | Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-171-3/+25
|\ \ \ | | | | | | | | Implement git_submodule_set_branch.
| * | | Implement git_submodule_set_branch.Patrick Steinhardt2015-04-121-3/+25
| | | |
* | | | Fix memleak in test/core/mkdir reported by CRTDBGJeff Hostetler2015-04-171-1/+1
| | | |
* | | | Merge pull request #3037 from libgit2/cmn/hide-then-pushEdward Thomson2015-04-161-0/+17
|\ \ \ \ | | | | | | | | | | Handle hide-then-push in the revwalk
| * | | | revwalk: add failing test for hiding and then pushing a commitCarlos Martín Nieto2015-04-081-0/+17
| | |_|/ | |/| | | | | | | | | | | | | | When we hide a commit which we later push into the revwalk, we do not handle this well and return commits which we should not.
* | | | Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbgEdward Thomson2015-04-161-0/+19
|\ \ \ \ | | | | | | | | | | Add memory leak detection/reporting using MSVC CRTDBG facility.
| * | | | Add MSVC CRTDBG memory leak reporting.Jeff Hostetler2015-04-151-0/+19
| |/ / /
* | | | Merge pull request #2974 from libgit2/cmn/clone-everythingEdward Thomson2015-04-101-0/+45
|\ \ \ \ | | | | | | | | | | Make sure to pack referenced objects for non-branches
| * | | | clone: add failing test for local transport with a tagCarlos Martín Nieto2015-03-171-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is a tag, we must make sure that we get all referenced objects from this tag as well. This failing test shows that e.g. when there is a tagged tree, we insert the top tree but do not descend, thus causing the clone to have broken links.
* | | | | Merge pull request #3030 from linquize/symlink_supportedEdward Thomson2015-04-101-0/+47
|\ \ \ \ \ | | | | | | | | | | | | If work_dir is not specified, use repo_dir to test if symlink is supported
| * | | | | Test: Create repo in while current dir is readonly and checkout symlinkLinquize2015-04-041-0/+47
| | |_|/ / | |/| | |
* | | | | Fix checking of return value for regcomp.Patrick Steinhardt2015-04-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regcomp function returns a non-zero value if compilation of a regular expression fails. In most places we only check for negative values, but positive values indicate an error, as well. Fix this tree-wide, fixing a segmentation fault when calling git_config_iterator_glob_new with an invalid regexp.
* | | | | describe: only abort without tags if fallback is not allowed.Patrick Steinhardt2015-04-071-1/+6
| |_|/ / |/| | | | | | | | | | | | | | | | | | | When no reference names could be found we did error out when trying to describe a commit. This is wrong, though, when the option to fall back to a commit's object ID is set.
* | | | Merge pull request #3011 from ethomson/filter_zero_tempbufEdward Thomson2015-03-2510-0/+22
|\ \ \ \ | | | | | | | | | | Clear temporary buffer when filtering
| * | | | Illustrate bad checkout on WindowsJacques Germishuys2015-03-2510-0/+22
| | |_|/ | |/| |
* | | | squash some leaksEdward Thomson2015-03-241-0/+2
| | | |
* | | | Merge pull request #2947 from libgit2/cmn/notes-bufEdward Thomson2015-03-242-5/+12
|\ \ \ \ | |/ / / |/| | | note: use a git_buf to return the default namespace
| * | | note: use a git_buf to return the default namespacecmn/notes-bufCarlos Martín Nieto2015-03-172-5/+12
| | |/ | |/| | | | | | | | | | | | | | | | The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.
* | | Merge pull request #2967 from jacquesg/merge-whitespaceEdward Thomson2015-03-1853-8/+206
|\ \ \ | |_|/ |/| | Allow merges of files (and trees) with whitespace problems/fixes
| * | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-4/+4
| | |
| * | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-164-8/+8
| | |
| * | Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1649-0/+198
| | |
* | | Merge pull request #2993 from ethomson/clar_updateCarlos Martín Nieto2015-03-181-1/+1
|\ \ \ | | | | | | | | clar: update to 08f434d
| * | | clar: update to 08f434dEdward Thomson2015-03-171-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'ethomson/submodule_8dot3'Carlos Martín Nieto2015-03-181-0/+108
|\ \ \
| * | | repository: Introduce "reserved names"Edward Thomson2015-02-271-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A repository can have multiple "reserved names" now, not just a single "short name" for the repository folder itself. Refactor to include a git_repository__reserved_names that returns all the reserved names for a repository.
* | | | Merge pull request #2985 from claudiuolteanu/patch-1Edward Thomson2015-03-171-1/+1
|\ \ \ \ | |_|/ / |/| | | Lower case the include directive of windows header
| * | | Lower case the include directive of windows headerClaudiu Olteanu2015-03-161-1/+1
| | |/ | |/| | | | Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
* | | Merge pull request #2962 from libgit2/cmn/reflog-annotatedEdward Thomson2015-03-175-16/+66
|\ \ \ | | | | | | | | Add annotated versions of ref-modying functions
| * | | Add tests for the annotated versions of ref-modifying functionsCarlos Martín Nieto2015-03-165-16/+66
| |/ / | | | | | | | | | | | | This also brings the soft-reset tests back to life. The function name was missing an underscore, meaning they had not been running.
* | | Merge pull request #2982 from libgit2/cmn/stream-check-ecEdward Thomson2015-03-171-0/+7
|\ \ \ | | | | | | | | Don't ask for a stream's certificate unless it's encrypted
| * | | Add failing test for cert callback with non-ecrypted streamCarlos Martín Nieto2015-03-161-0/+7
| |/ / | | | | | | | | | | | | | | | When we have an HTTP stream and have set the certificatre check callback, we currently fail as we ask the unencrypted stream for its certificate.
* | | Merge pull request #2977 from pks-t/submodule-sync-url-fixEdward Thomson2015-03-171-3/+3
|\ \ \ | |/ / |/| | Fix git_submodule_sync writing URL to wrong key.
| * | Fix git_submodule_sync writing URL to wrong key.Patrick Steinhardt2015-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently git_submodule_sync writes the submodule's URL to the key 'branch.<REMOTE_NAME>.remote' while the reference implementation of `git submodule sync` writes to 'remote.<REMOTE_NAME>.url', which is the intended behavior according to git-submodule(1).
* | | Put back the number of expected references to 6 from the test repoCarlos Martín Nieto2015-03-131-3/+3
|/ / | | | | | | | | | | | | This was but down to 5 when GitHub made a change to their server which made them stop honouring the include-tag request. This has recently been corrected, so we can bring it back up to six.
* | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-111-0/+122
|\ \
| * | Add API to add a memory buffer to an indexDamien PROFETA2015-02-251-0/+122
| |/ | | | | | | | | | | git_index_add_frombuffer enables now to store a memory buffer in the odb and to store an entry in the index directly if the index is attached to a repository.
* | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-111-0/+27
|\ \ | | | | | | "In-memory" repos are bare by default
| * | repository_new: test its barenessEdward Thomson2015-03-101-0/+27
| | |
* | | Fixed build warningPierre-Olivier Latour2015-03-081-1/+1
| | |
* | | refdb: use the same id for old and new when renaming a referencecmn/rename-reflogCarlos Martín Nieto2015-03-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we rename a reference, we want the old and new ids to be the same one (as we did not change it). The normal code path looks up the old id from the current value of the brtanch, but by the time we look it up, it does not exist anymore and thus we write a zero id. Pass the old id explicitly instead.
View Lorry Controller Status