summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Clar: skip testsvmg/clar-skip-testVicent Marti2014-04-026-73/+89
|
* Add warning when skipping blame testRussell Belfer2014-04-021-12/+7
|
* Skip blame libgit2 test if not in libgit2 repoRussell Belfer2014-04-011-2/+11
| | | | | | | | One blame test replies on being run from within the libgit2 repository to leverage having a longer history to play with, but some bundled versions of libgit2 don't have the whole libgit2 history. This just skips that test if the repository can't be opened.
* Merge pull request #2226 from libgit2/rb/submodule-sorting-fixEdward Thomson2014-04-011-0/+6
|\ | | | | Fix submodule sort order during iteration
| * Improve test of submodule name sortingRussell Belfer2014-03-311-0/+6
| |
* | Merge pull request #2206 from libgit2/cmn/inmemory-swap-orderVicent Marti2014-04-013-9/+9
|\ \ | | | | | | Rename in-memory remote to anonymous and swap url and fetch order
| * | remote: rename inmemory to anonymous and swap url and fetch orderCarlos Martín Nieto2014-04-013-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The order in this function is the opposite to what create_with_fetchspec() has, so change this one, as url-then-refspec is what git does. As we need to break compilation and the swap doesn't do that, let's take this opportunity to rename in-memory remotes to anonymous as that's really what sets them apart.
* | | Merge pull request #2178 from libgit2/rb/fix-short-idEdward Thomson2014-03-313-10/+19
|\ \ \ | |_|/ |/| | Fix git_odb_short_id and git_odb_exists_prefix bugs
| * | Add failing test for git_object_short_idJiri Pospisil2014-03-102-0/+7
| | |
| * | Fix a number of git_odb_exists_prefix bugsRussell Belfer2014-03-101-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git_odb_exists_prefix API was not dealing correctly when a later backend returned GIT_ENOTFOUND even if an earlier backend had found the object. Additionally, the unit tests were not properly exercising the API and had a couple mistakes in checking the results. Lastly, since the backends are not expected to behavior correctly unless all bytes of the short id are zero except for the prefix, this makes the ODB prefix APIs explicitly clear out the extra bytes so the user doesn't have to be as careful.
* | | Introduce git_merge_head_idEdward Thomson2014-03-311-0/+27
| | |
* | | Update clar to 4b75388Edward Thomson2014-03-281-2/+8
| | |
* | | Sandbox configuration during test runsEdward Thomson2014-03-281-1/+10
| | |
* | | Update clar to 587f88aEdward Thomson2014-03-283-3/+35
| | |
* | | Fix memory leak of test repository objectRussell Belfer2014-03-271-2/+5
| | |
* | | Fix error when submodule path and name differRussell Belfer2014-03-261-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | When a submodule was inserted with a different path and name, the return value from khash greater than zero was allowed to propagate back out to the caller when it should really be zeroed. This led to a possible crash when reloading submodules if that was the first time that submodule data was loaded.
* | | Fix segfault if gitmodules is invalidRussell Belfer2014-03-261-0/+95
| | | | | | | | | | | | | | | | | | The reload_all call could end up dereferencing a NULL pointer if there was an error while attempting to load the submodules config data (i.e. invalid content in the gitmodules file). This fixes it.
* | | Decorate unused params as unused in revwalk::hidecb testsEdward Thomson2014-03-261-0/+9
| | |
* | | Merge pull request #2204 from libgit2/rb/submodule-reference-countingVicent Marti2014-03-268-244/+197
|\ \ \ | |_|/ |/| | Make submodules externally refcounted
| * | Make submodules externally refcountedRussell Belfer2014-03-258-244/+197
| | | | | | | | | | | | | | | | | | | | | | | | `git_submodule` objects were already refcounted internally in case the submodule name was different from the path at which it was stored. This makes that refcounting externally used as well, so `git_submodule_lookup` and `git_submodule_add_setup` return an object that requires a `git_submodule_free` when done.
* | | Merge pull request #2205 from libgit2/rb/submodule-untracked-vs-ignoredVicent Marti2014-03-264-12/+78
|\ \ \ | | | | | | | | Update behavior for untracked contained repositories
| * | | Update behavior for untracked sub-reposRussell Belfer2014-03-254-12/+78
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a directory containing a .git directory (or even just a plain gitlink) was found, libgit2 was going out of its way to treat it specially. This seemed like it was necessary because the diff code was not originally emulating Git's behavior for untracked directories correctly (i.e. scanning for ignored vs untracked items inside). Now that libgit2 diff mimics Git's untracked directory behavior, the special handling for contained Git repos is actually incorrect and this commit rips it out.
* | | Test for giterr_captureEdward Thomson2014-03-251-0/+24
| | |
* | | Merge pull request #2181 from anuraggup/hide_cbEdward Thomson2014-03-251-0/+198
|\ \ \ | |/ / |/| | Callback function to hide commit and its parents in revision walker
| * | Modified test for revwalk_hidecbAnurag Gupta2014-03-241-2/+2
| | |
| * | Conforming to libgit2 coding style.Anurag Gupta2014-03-241-3/+2
| | |
| * | Unit Tests for hide_cb in revwalkAnurag Gupta2014-03-241-0/+199
| | |
* | | env test needs to deref git_buf's ptrEdward Thomson2014-03-241-1/+1
| | |
* | | Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-2419-474/+465
|\ \ \ | |/ / |/| | Refactor the `git_merge` API
| * | UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-1/+2
| | |
| * | Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-4/+20
| | |
| * | git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-22/+23
| | |
| * | Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-208-122/+34
| | |
| * | Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-2012-31/+31
| | |
| * | Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-209-50/+45
| | |
| * | Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-77/+47
| | |
| * | Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-203-148/+90
| | |
| * | Introduce git_merge_file for consumersEdward Thomson2014-03-206-74/+228
| | |
* | | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-241-4/+6
| | | | | | | | | | | | | | | This survived the last round of culling, as the signature is only in the comments.
* | | reflog: follow core.logallrefupdatesCarlos Martín Nieto2014-03-201-0/+73
|/ / | | | | | | | | On bare by default, or when core.logallrefupdates is false, we must not write the reflog.
* | reflog: handle symref chainsCarlos Martín Nieto2014-03-191-0/+51
| | | | | | | | | | Given HEAD -> master -> foo, when updating foo's reflog we should also update HEAD's, as it's considered the current branch.
* | reflog: handle the birth of a branchCarlos Martín Nieto2014-03-191-0/+48
| | | | | | | | | | | | The reflog append function was overzealous in its checking. When passed an old and new ids, it should not do any checking, but just serialize the data to a reflog entry.
* | refdb: don't update when there's no needCarlos Martín Nieto2014-03-192-0/+51
| | | | | | | | | | If the caller wants to update a ref to point to the same target as it currently has, we should return early and avoid writing to the reflog.
* | reflog: more comprehensive HEAD testsCarlos Martín Nieto2014-03-181-0/+72
| | | | | | | | | | | | | | | | | | The existing ones lack checking zeroed ids when switching back from an unborn branch as well as what happens when detaching. The reflog appending function mistakenly wrote zeros when dealing with a detached HEAD. This explicitly checks for those situations and fixes them.
* | Implement git_merge_base_octopusAimeast2014-03-181-1/+64
| |
* | refs: append to the HEAD reflog when updating the current branchCarlos Martín Nieto2014-03-174-10/+36
| | | | | | | | | | | | | | | | When we update the current branch, we must also append to HEAD's reflog to keep them in sync. This is a bit of a hack, but as git.git says, it covers 100% of default cases.
* | repo: remove test which deletes HEADCarlos Martín Nieto2014-03-171-21/+0
| | | | | | | | | | | | This is not something anybody would ever do; removing HEAD makes the .git/ directory no longer be a repository, so we wouldn't be expected to handle such a situation.
* | Fix pqueue sort boundary condition bugRussell Belfer2014-03-122-0/+90
|/ | | | | | If the pqueue comparison fn returned just 0 or 1 (think "a<b") then the sort order of returned items could be wrong because there was a "< 0" that really needed to be "<= 0". Yikes!!!
* Update clar to e1990d6Edward Thomson2014-03-072-4/+4
|
* Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-0716-98/+123
|\ | | | | Rename options structures
View Lorry Controller Status