summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* object_type: convert final internal users to new namesethomson/git_objEdward Thomson2019-01-1710-17/+17
* object_type: GIT_OBJECT_BAD is now GIT_OBJECT_INVALIDEdward Thomson2019-01-1710-25/+25
* object_type: mark old values as deprecatedEdward Thomson2019-01-171-10/+10
* Merge pull request #4937 from lhchavez/fix-crlfEdward Thomson2019-01-151-55/+55
|\
| * Convert tests/resources/push.sh to LF endingslhchavez2019-01-151-55/+55
|/
* Merge pull request #4936 from implausible/remove/unnecessary-test-filesEdward Thomson2019-01-142151-11979/+0
|\
| * Get rid of some test files that were accidentally committedTyler Wanek2019-01-142151-11979/+0
|/
* Merge pull request #4934 from stinb/proxy-crashEdward Thomson2019-01-142-0/+10
|\
| * proxy: fix crash on remote connection with GIT_PROXY_AUTO but no proxy is det...Jason Haslam2019-01-142-0/+10
* | Merge pull request #4924 from lhchavez/werrorEdward Thomson2019-01-102-10/+9
|\ \
| * | Make ENABLE_WERROR actually worklhchavez2019-01-102-10/+9
| |/
* | Merge pull request #4931 from tiennou/cmake/osx-deprecated-warnEdward Thomson2019-01-101-3/+0
|\ \ | |/ |/|
| * cmake: remove unconditional -Wno-deprecated-declaration on APPLEEtienne Samson2019-01-101-3/+0
|/
* Merge pull request #4926 from csware/warning-c4133Edward Thomson2019-01-091-1/+1
|\
| * Fix warning 'function': incompatible types - from 'git_cvar_value *' to 'int ...Sven Strickroth2019-01-071-1/+1
* | Merge pull request #4928 from lhchavez/fix-warningsEdward Thomson2019-01-092-9/+9
|\ \
| * | Fix Linux warningslhchavez2019-01-082-9/+9
|/ /
* | Merge pull request #4922 from tiennou/fix/coverity-cidsEdward Thomson2019-01-086-1/+32
|\ \ | |/ |/|
| * coverity: attempt to model clar's assertionsEtienne Samson2019-01-041-0/+23
| * tests: add missing assertsEtienne Samson2019-01-041-0/+2
| * refs: assert that we're passed valid refs when renamingEtienne Samson2019-01-041-0/+2
| * diff: assert that we're passed a valid git_diff objectEtienne Samson2019-01-041-0/+2
| * submodule: grab the error while loading from configEtienne Samson2019-01-041-1/+1
| * config: assert that our parameters are validEtienne Samson2019-01-041-0/+2
|/
* Merge pull request #4919 from pks-t/pks/shutdown-cb-countEdward Thomson2019-01-037-20/+49
|\
| * global: move init callbacks into an arrayPatrick Steinhardt2019-01-021-14/+22
| * hash: convert `global_init` macros to real functionPatrick Steinhardt2019-01-026-6/+27
* | Merge pull request #4904 from libgit2/ethomson/crlfEdward Thomson2019-01-037654-238/+33402
|\ \
| * | checkout::crlf: ensure successethomson/crlfEdward Thomson2018-12-191-30/+33
| * | Additional core.autocrlf and core.safecrlf testsSven Strickroth2018-12-032-3/+52
| * | crlf: update to match git's logicEdward Thomson2018-12-033-201/+215
| * | index::crlf: better error reporting in core git testsEdward Thomson2018-12-031-8/+25
| * | index::crlf: simplify test caseEdward Thomson2018-12-031-60/+42
| * | crlf tests: use known-good data produced by gitSven Strickroth2018-12-031-1/+206
| * | crlf_data: add corpus of known-good odb-filtered dataEdward Thomson2018-12-036257-0/+32690
| * | crlf: re-use existing crlf script to create odbEdward Thomson2018-12-0322-118/+63
| * | crlf: script to generate expected crlf data for adding files to indexSven Strickroth2018-12-0322-3/+232
| * | checkout::crlf clear the crlf workdir for checkoutEdward Thomson2018-12-031-0/+24
| * | crlf_data: move to a "to_workdir" folderEdward Thomson2018-12-031371-5/+11
* | | Merge pull request #4915 from pks-t/pks/refdb-minor-refactoringsEdward Thomson2018-12-191-12/+11
|\ \ \
| * | | refdb_fs: refactor error handling in `refdb_reflog_fs__delete`Patrick Steinhardt2018-12-191-12/+11
|/ / /
* | | Merge pull request #4833 from csware/drop-empty-dirsPatrick Steinhardt2018-12-192-2/+88
|\ \ \
| * | | Remove empty directories when deleting refsSven Strickroth2018-10-132-2/+88
* | | | Merge pull request #4910 from libgit2/cmn/annotated-from-tagPatrick Steinhardt2018-12-194-12/+39
|\ \ \ \
| * | | | annotated_commit: peel to commit instead of assuming we have onecmn/annotated-from-tagCarlos Martín Nieto2018-12-141-4/+4
| * | | | refs: constify git_reference_peelCarlos Martín Nieto2018-12-142-8/+9
| * | | | annotated_commit: add failing test for looking up from annotated tagCarlos Martín Nieto2018-12-141-0/+26
|/ / / /
* | | | Merge pull request #4906 from QBobWatson/bugfixEdward Thomson2018-12-061-5/+9
|\ \ \ \
| * | | | Typesetting conventionsJoe Rabinoff2018-12-061-9/+9
| * | | | Removed one null checkJoe Rabinoff2018-12-041-3/+2
View Lorry Controller Status