summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove Makefile.embedcmn/no-embedCarlos Martín Nieto2016-04-051-60/+0
* Merge pull request #3724 from ethomson/submodule_start_supports_silly_slashesCarlos Martín Nieto2016-04-023-16/+85
|\
| * iterator: support trailing `/` in start for submodEdward Thomson2016-04-022-16/+38
| * diff: test submodules are found with trailing `/`Edward Thomson2016-04-021-0/+47
* | Merge pull request #3723 from libgit2/cmn/ignore-symlinkEdward Thomson2016-04-022-3/+24
|\ \ | |/ |/|
| * ignore: don't use realpath to canonicalize pathcmn/ignore-symlinkCarlos Martín Nieto2016-04-022-3/+24
|/
* Merge pull request #3720 from pks-t/pks/merge-driver-memleaksCarlos Martín Nieto2016-04-011-0/+1
|\
| * merge_driver: fix missing `goto done;`Patrick Steinhardt2016-04-011-0/+1
* | Merge pull request #3719 from libgit2/ethomson/submodule_statusCarlos Martín Nieto2016-04-01231-1/+423
|\ \ | |/ |/|
| * iterator: use correct search functionethomson/submodule_statusEdward Thomson2016-03-311-1/+1
| * status: test submodules with mixed caseEdward Thomson2016-03-31230-0/+422
* | Merge pull request #3717 from libgit2/ethomson/leaksCarlos Martín Nieto2016-03-319-9/+60
|\ \ | |/ |/|
| * leaks: call `xdl_free_classifier`Edward Thomson2016-03-311-1/+1
| * leaks: fix some leaks in the testsEdward Thomson2016-03-315-2/+19
| * leaks: fix some iterator leaksEdward Thomson2016-03-311-6/+22
| * Plug a few leaksCarlos Martín Nieto2016-03-313-0/+18
|/
* Merge pull request #3716 from libgit2/cmn/typedef-sizetEdward Thomson2016-03-311-0/+8
|\
| * Add a no-op size_t typedef for the doc parsercmn/typedef-sizetCarlos Martín Nieto2016-03-311-0/+8
* | Merge pull request #3575 from pmq20/master-13jan16Carlos Martín Nieto2016-03-312-4/+0
|\ \
| * | Remove duplicated calls to git_mwindow_closeP.S.V.R2016-01-132-4/+0
* | | Merge pull request #3715 from pks-t/pks/xprepare-memleakCarlos Martín Nieto2016-03-311-1/+2
|\ \ \ | |_|/ |/| |
| * | xdiff/xprepare: fix a memory leakPatrick Steinhardt2016-03-311-0/+1
| * | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsPatrick Steinhardt2016-03-311-1/+1
|/ /
* | Merge pull request #3712 from ethomson/config_duplicate_sectionCarlos Martín Nieto2016-03-292-4/+33
|\ \
| * | config::write::repeated: init our bufferEdward Thomson2016-03-281-1/+1
| * | config: don't write section header if we're in itEdward Thomson2016-03-281-4/+9
| * | config: show we write a spurious duplicated section headerCarlos Martín Nieto2016-03-281-0/+24
* | | Merge pull request #3703 from libgit2/cmn/multivar-set-lockedEdward Thomson2016-03-282-18/+1
|\ \ \ | |/ / |/| |
| * | config: don't special-case multivars that don't exist yetcmn/multivar-set-lockedCarlos Martín Nieto2016-03-212-18/+1
* | | Merge pull request #3708 from sschuberth/masterEdward Thomson2016-03-281-1/+3
|\ \ \
| * | | CMakeLists: Further improve the error messages regarding CMAKE_SIZEOF_VOID_PSebastian Schuberth2016-03-241-1/+3
* | | | Merge pull request #3691 from ethomson/iteratorsCarlos Martín Nieto2016-03-2624-4162/+6103
|\ \ \ \
| * | | | iterator: comment fixedMarc Strapetz2016-03-241-2/+2
| * | | | iterator: unused includes removedMarc Strapetz2016-03-241-4/+0
| * | | | iterator: new workdir-iterator test for pathlist + includings treesMarc Strapetz2016-03-241-0/+26
| * | | | iterator: new index-iterator test for pathlist + includings treesMarc Strapetz2016-03-241-0/+31
| * | | | iterator: more pathlist-related tests should test actual pathsMarc Strapetz2016-03-242-6/+23
| * | | | iterator: cleanupsEdward Thomson2016-03-243-366/+54
| * | | | iterator: don't run the gunk test by default on CIEdward Thomson2016-03-241-1/+1
| * | | | iterator: refactor empty iterator to new styleEdward Thomson2016-03-241-15/+36
| * | | | iterator: mandate `advance_over`Edward Thomson2016-03-242-6/+11
| * | | | iterator: refactor index iteratorEdward Thomson2016-03-245-258/+882
| * | | | Introduce `git_path_common_dirlen`Edward Thomson2016-03-243-0/+46
| * | | | iterator: move the index into the iterator itselfEdward Thomson2016-03-242-36/+15
| * | | | iterator: give the tests a proper hierarchyEdward Thomson2016-03-247-3332/+3375
| * | | | Added clar test for #3568Jeff Hostetler2016-03-231-0/+129
| * | | | diff: stop processing nitem when its removedEdward Thomson2016-03-231-1/+1
| * | | | iterator: drop `advance_into_or_over`Edward Thomson2016-03-232-20/+1
| * | | | iterator: test that we can `advance_into` empty dirsEdward Thomson2016-03-231-0/+59
| * | | | Failing test.joshaber2016-03-231-10/+53
View Lorry Controller Status