summaryrefslogtreecommitdiff
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.
* refspec: git_refspec_parse() does not existCarlos Martín Nieto2014-04-011-1/+0
|
* Merge pull request #2208 from libgit2/vmg/mempackRussell Belfer2014-04-013-0/+278
|\ | | | | In-memory packing backend
| * In-memory packing backendvmg/mempackVicent Marti2014-03-263-0/+278
| |
* | Merge pull request #2226 from libgit2/rb/submodule-sorting-fixEdward Thomson2014-04-015-19/+52
|\ \ | | | | | | Fix submodule sort order during iteration
| * | Improve test of submodule name sortingRussell Belfer2014-03-311-0/+6
| | |
| * | CleanupsRussell Belfer2014-03-313-4/+4
| | |
| * | Fix submodule sorting in workdir iteratorRussell Belfer2014-03-311-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the changes to how git_path_dirload_with_stat handles things that look like submodules, submodules could end up sorted in the wrong order with the workdir iterator. This moves the submodule check earlier in the iterator processing of a new directory so that the submodule name updates will happen immediately and the sort order will be correct.
| * | Add faster git_submodule__is_submodule checkRussell Belfer2014-03-312-0/+18
| | |
* | | Merge pull request #2229 from linquize/Wdeclaration-after-statementVicent Marti2014-04-011-1/+1
|\ \ \ | | | | | | | | Add CFLAGS -Wdeclaration-after-statement
| * | | Add CFLAGS -Wdeclaration-after-statementLinquize2014-04-011-1/+1
|/ / / | | | | | | | | | This warns local variables declarations after statement, which helps not to break MSVC
* | | Merge pull request #2228 from mekishizufu/example_short_idVicent Marti2014-04-011-4/+6
|\ \ \ | | | | | | | | Use git_object_short_id in examples
| * | | examples: Use git_object_short_idJiri Pospisil2014-04-011-4/+6
| | | |
* | | | Merge pull request #2206 from libgit2/cmn/inmemory-swap-orderVicent Marti2014-04-017-22/+22
|\ \ \ \ | |/ / / |/| | | 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-017-22/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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-314-17/+36
|\ \ \ | |_|/ |/| | 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-102-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2224 from ethomson/merge_file_constVicent Marti2014-03-312-4/+4
|\ \ \ | | | | | | | | Const up members of git_merge_file_result
| * | | Const up members of git_merge_file_resultEdward Thomson2014-03-312-4/+4
|/ / /
* | | Merge pull request #2222 from ethomson/merge_head_idVicent Marti2014-03-313-0/+44
|\ \ \ | | | | | | | | Introduce git_merge_head_id
| * | | Introduce git_merge_head_idEdward Thomson2014-03-313-0/+44
| | | |
* | | | Merge pull request #2219 from tiennou/reset-need-packCarlos Martín Nieto2014-03-311-1/+2
|\ \ \ \ | |/ / / |/| | | Don't reset need_pack
| * | | Don't reset need_packEtienne Samson2014-03-301-1/+2
|/ / / | | | | | | While looping over multiple heads, an up-to-date head will clobber the `remote->need_pack` setting, preventing the rest of the machinery from building and downloading a pack-file, breaking fetches.
* | | Merge pull request #2216 from ethomson/clarEdward Thomson2014-03-291-2/+8
|\ \ \ | | | | | | | | Update clar to 4b75388
| * | | Update clar to 4b75388Edward Thomson2014-03-281-2/+8
|/ / /
* | | Merge pull request #2214 from ethomson/sandbox_configVicent Marti2014-03-284-4/+45
|\ \ \ | | | | | | | | RFC: Sandbox HOME during test execution
| * | | Sandbox configuration during test runsEdward Thomson2014-03-281-1/+10
| | | |
| * | | Update clar to 587f88aEdward Thomson2014-03-283-3/+35
|/ / /
* | | Merge pull request #2212 from libgit2/rb/submodule-use-after-freeVicent Marti2014-03-272-5/+12
|\ \ \ | | | | | | | | Fix use-after-free in submodule reload code and other memory leaks
| * | | Fix memory leak of test repository objectRussell Belfer2014-03-271-2/+5
| | | |
| * | | Fix memory leak of submodule branch nameRussell Belfer2014-03-271-0/+1
| | | |
| * | | Fix use-after-free in submodule reloadRussell Belfer2014-03-271-3/+6
|/ / / | | | | | | | | | | | | | | | If the first call to release a no-longer-existent submodule freed the object, the check if a second is needed would dereference the data that was just freed.
* | | Merge pull request #2210 from libgit2/rb/submodule-api-with-no-submodulesVicent Marti2014-03-274-7/+139
|\ \ \ | | | | | | | | Fix segfault if gitmodules is invalid
| * | | Fix error when submodule path and name differRussell Belfer2014-03-262-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-5/+101
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2209 from ethomson/cleanupVicent Marti2014-03-262-2/+10
|\ \ \ | | | | | | | | Cleanup some warnings and mem leaks
| * | | Free temporary merge indexEdward Thomson2014-03-261-2/+1
| | | |
| * | | 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-2615-364/+461
|\ \ \ | |_|/ |/| | Make submodules externally refcounted
| * | Fix submodule leaks and invalid referencesRussell Belfer2014-03-254-30/+105
| | | | | | | | | | | | | | | | | | | | | This cleans up some places I missed that could hold onto submodule references and cleans up the way in which the repository cache is both reloaded and released so that existing submodule references aren't destroyed inappropriately.
| * | Make submodules externally refcountedRussell Belfer2014-03-2515-334/+356
| | | | | | | | | | | | | | | | | | | | | | | | `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-266-23/+82
|\ \ \ | | | | | | | | Update behavior for untracked contained repositories
| * | | Update behavior for untracked sub-reposRussell Belfer2014-03-256-23/+82
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2166 from ethomson/giterr_restoreVicent Marti2014-03-262-0/+29
|\ \ \ | | | | | | | | clone: don't overwrite original error message
| * | | clone: don't overwrite original error messageEdward Thomson2014-03-251-0/+5
| | | |
| * | | Test for giterr_captureEdward Thomson2014-03-251-0/+24
|/ / /
* | | Merge pull request #2181 from anuraggup/hide_cbEdward Thomson2014-03-254-5/+251
|\ \ \ | |/ / |/| | Callback function to hide commit and its parents in revision walker