summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't reset need_packEtienne Samson2014-03-301-1/+2
* Merge pull request #2216 from ethomson/clarEdward Thomson2014-03-291-2/+8
|\
| * Update clar to 4b75388Edward Thomson2014-03-281-2/+8
|/
* Merge pull request #2214 from ethomson/sandbox_configVicent Marti2014-03-284-4/+45
|\
| * 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 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
|/
* Merge pull request #2210 from libgit2/rb/submodule-api-with-no-submodulesVicent Marti2014-03-274-7/+139
|\
| * Fix error when submodule path and name differRussell Belfer2014-03-262-2/+38
| * Fix segfault if gitmodules is invalidRussell Belfer2014-03-263-5/+101
|/
* Merge pull request #2209 from ethomson/cleanupVicent Marti2014-03-262-2/+10
|\
| * 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
|\
| * Fix submodule leaks and invalid referencesRussell Belfer2014-03-254-30/+105
| * Make submodules externally refcountedRussell Belfer2014-03-2515-334/+356
* | Merge pull request #2205 from libgit2/rb/submodule-untracked-vs-ignoredVicent Marti2014-03-266-23/+82
|\ \
| * | Update behavior for untracked sub-reposRussell Belfer2014-03-256-23/+82
| |/
* | Merge pull request #2166 from ethomson/giterr_restoreVicent Marti2014-03-262-0/+29
|\ \
| * | 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
|\ \ | |/ |/|
| * Modified test for revwalk_hidecbAnurag Gupta2014-03-241-2/+2
| * Correcting format of comments in header fileAnurag Gupta2014-03-241-13/+13
| * Undoing local change done for building on x64Anurag Gupta2014-03-242-2/+1
| * Conforming to libgit2 coding style.Anurag Gupta2014-03-244-8/+5
| * Remove unused push_cb_dataAnurag Gupta2014-03-241-5/+0
| * Unit Tests for hide_cb in revwalkAnurag Gupta2014-03-242-2/+201
| * Callback to hide commits in revision walker.Anurag Gupta2014-03-243-0/+56
* | Merge pull request #2201 from ethomson/gitbuf_test_fixRussell Belfer2014-03-241-1/+1
|\ \
| * | env test needs to deref git_buf's ptrEdward Thomson2014-03-241-1/+1
|/ /
* | Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-2429-999/+1092
|\ \ | |/ |/|
| * UNBORN implies FAST_FORWARDEdward Thomson2014-03-203-4/+5
| * Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-203-14/+52
| * git_merge_status -> git_merge_analysisEdward Thomson2014-03-203-37/+41
| * Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-2011-239/+39
| * Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-2017-75/+75
| * Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-2011-116/+75
| * Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-204-189/+73
| * Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-205-157/+204
| * Introduce git_merge_file for consumersEdward Thomson2014-03-2013-280/+640
* | Merge pull request #2200 from libgit2/cmn/opts-bufVicent Marti2014-03-243-16/+25
|\ \
| * | opts: bits are not bytesCarlos Martín Nieto2014-03-241-1/+1
| * | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-243-15/+24
|/ /
* | Merge pull request #2197 from linquize/assert-wrongVicent Marti2014-03-211-1/+1
|\ \
| * | Fix wrong assertionLinquize2014-03-211-1/+1
|/ /
* | Merge pull request #2195 from libgit2/cmn/revwalk-no-hideVicent Marti2014-03-203-5/+22
|\ \