summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* skip loading an index if we loaded the repo as barebrianmario/attr-from-treeBrian Lopez2017-03-021-1/+1
* bring declaration outside of for loop statement bodyBrian Lopez2017-03-021-1/+2
* Merge remote-tracking branch 'origin/master' into brianmario/attr-from-treeBrian Lopez2017-03-028-14/+123
|\
| * Merge pull request #4148 from pks-t/pks/fix-haiku-buildsPatrick Steinhardt2017-03-011-1/+4
| |\
| | * cmake: only enable supported compiler warning flagsPatrick Steinhardt2017-03-011-1/+4
| |/
| * Merge pull request #4145 from pks-t/pks/refs-create-memleakPatrick Steinhardt2017-03-011-1/+1
| |\
| | * tests: refs::create: fix memory leakPatrick Steinhardt2017-03-011-1/+1
| |/
| * Merge pull request #4143 from richardipsum/issue-4094Patrick Steinhardt2017-03-012-2/+56
| |\
| | * Add test for inclusion of (merge) in reflogRichard Ipsum2017-02-281-1/+43
| | * Fix: make reflog include "(merge)" for merge commitsRichard Ipsum2017-02-271-1/+13
| * | Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-testEdward Thomson2017-02-261-5/+54
| |\ \
| | * | Whitespace and style fixesRichard Ipsum2017-02-251-5/+5
| | * | tests: Add create__symbolic_with_arbitrary_contentRichard Ipsum2017-02-251-0/+49
| * | | Merge pull request #4142 from pblesi/patch-1Edward Thomson2017-02-261-2/+2
| |\ \ \
| | * | | Fix minor typos in CONVENTIONS.mdPatrick Blesi2017-02-251-2/+2
| | | |/ | | |/|
| * | | Merge pull request #4141 from kainjow/patch-2Edward Thomson2017-02-261-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix inet_pton tests triggering an assert in HaikuKevin Wojniak2017-02-251-2/+2
| |/ /
| * | Merge pull request #4137 from libgit2/ethomson/appveyorEdward Thomson2017-02-252-2/+5
| |\ \ | | |/ | |/|
| | * appveyor: don't rewrite system mingwethomson/appveyorEdward Thomson2017-02-241-2/+4
| | * appveyor: always build the 'appveyor' branchEdward Thomson2017-02-241-0/+1
| |/
* | Add a test case for `git_attr_get_by_tree`.Arthur Schreiber2017-03-021-0/+41
* | Only load the minimal set of git objects to get gitattribute data.Arthur Schreiber2017-03-022-28/+24
* | fix issue with not passing retval addressBrian Lopez2017-02-241-1/+1
* | Merge branch 'master' into brianmario/attr-from-treeBrian Lopez2017-02-24146-560/+3250
|\ \ | |/
| * Merge pull request #4133 from stinb/khash-cleanup-regressionPatrick Steinhardt2017-02-241-3/+3
| |\
| | * pack: fix looping over cache entriesJason Haslam2017-02-221-3/+3
| * | Merge pull request #4131 from pks-t/pks/attrcache-cleanupsCarlos Martín Nieto2017-02-222-10/+10
| |\ \
| | * | attrcache: remove useless `do_init` indirectionPatrick Steinhardt2017-02-212-5/+2
| | * | attrcache: replace existing file entry with `git__swap`Patrick Steinhardt2017-02-211-2/+5
| | * | attrcache: do not lock/unlock the mutex directlyPatrick Steinhardt2017-02-211-3/+3
| | |/
| * | Merge pull request #4135 from libgit2/ethomson/ancient_gcc_not_threadsafeCarlos Martín Nieto2017-02-221-0/+6
| |\ \ | | |/ | |/|
| | * Provide error on gcc < 4.1 when THREADSAFEethomson/ancient_gcc_not_threadsafeEdward Thomson2017-02-221-0/+6
| |/
| * Merge pull request #4130 from libgit2/ethomson/clar_messagesEdward Thomson2017-02-177-24/+36
| |\
| | * `cl_git_exec` -> `cl_git_expect`ethomson/clar_messagesEdward Thomson2017-02-174-11/+11
| | * tests: provide better pass/failure error messagesEdward Thomson2017-02-176-23/+35
| | * p_snprintf: no need for arguments to a formatEdward Thomson2017-02-171-1/+1
| * | Merge pull request #4092 from pks-t/pks/khash-cleanupsPatrick Steinhardt2017-02-1733-347/+610
| |\ \ | | |/ | |/|
| | * idxmap: remove GIT__USE_IDXMAPPatrick Steinhardt2017-02-173-23/+14
| | * idxmap: convert to use functions instead of macrosPatrick Steinhardt2017-02-172-43/+143
| | * offmap: remove GIT__USE_OFFMAP macroPatrick Steinhardt2017-02-173-6/+1
| | * offmap: convert to use functions instead of macrosPatrick Steinhardt2017-02-172-23/+97
| | * oidmap: remove GIT__USE_OIDMAP macroPatrick Steinhardt2017-02-1710-25/+7
| | * oidmap: convert macros to functionsPatrick Steinhardt2017-02-172-22/+115
| | * strmap: remove GIT__USE_STRMAP macroPatrick Steinhardt2017-02-1716-31/+1
| | * strmap: convert macros to functionsPatrick Steinhardt2017-02-172-27/+112
| | * khash: avoid using `kh_resize` directlyPatrick Steinhardt2017-02-172-6/+7
| | * khash: avoid using macro magic to get return addressPatrick Steinhardt2017-02-1718-37/+37
| | * khash: avoid using `kh_key`/`kh_val` as lvaluePatrick Steinhardt2017-02-1710-17/+20
| | * khash: avoid using `kh_put` directlyPatrick Steinhardt2017-02-1711-11/+17
| | * khash: avoid using `kh_del` directlyPatrick Steinhardt2017-02-173-4/+5