summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* inet_pton: don't assume addr families don't existethomson/3872Edward Thomson2017-03-221-4/+1
* Merge pull request #4139 from richardipsum/readme-running-testsEdward Thomson2017-03-211-0/+8
|\
| * README: Mention how to run testsRichard Ipsum2017-03-051-0/+8
* | Merge pull request #4171 from rcjsuen/patch-1Patrick Steinhardt2017-03-201-1/+1
|\ \
| * | Fix typo in remote.h APIRemy Suen2017-03-201-1/+1
|/ /
* | Merge pull request #4166 from pks-t/pks/map-free-fixEdward Thomson2017-03-209-15/+9
|\ \
| * | map: remove `*map_free` macrosPatrick Steinhardt2017-03-208-13/+8
| * | checkout: fix double-free of checkout_data's mkdir_mapPatrick Steinhardt2017-03-201-2/+1
* | | Merge pull request #4169 from csware/absolute-symlinkPatrick Steinhardt2017-03-202-1/+30
|\ \ \
| * | | tests: filebuf: test writing to symlink with absolute pathsPatrick Steinhardt2017-03-201-0/+29
| * | | filebuf: fix resolving absolute symlinksSven Strickroth22017-03-201-1/+1
| | |/ | |/|
* | | Merge pull request #4160 from pks-t/pks/diff-fixesPatrick Steinhardt2017-03-205-82/+120
|\ \ \
| * | | diff_parse: correctly set options for parsed diffsPatrick Steinhardt2017-03-142-1/+24
| * | | patch_parse: fix parsing minimal trailing diff linePatrick Steinhardt2017-03-142-2/+24
| * | | patch_generate: move `git_diff_foreach` to diff.cPatrick Steinhardt2017-03-142-36/+35
| * | | patch_generate: fix `git_diff_foreach` only working with generated diffsPatrick Steinhardt2017-03-142-23/+38
| * | | patch_generate: remove duplicated logicPatrick Steinhardt2017-03-141-29/+8
* | | | Merge pull request #4162 from pks-t/pks/merge-source-fixesPatrick Steinhardt2017-03-202-10/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge_driver: fix const-correctness for source gettersPatrick Steinhardt2017-03-152-10/+10
* | | | Merge pull request #4161 from pks-t/pks/submodule-index-fixEdward Thomson2017-03-151-1/+9
|\ \ \ \ | |/ / / |/| | |
| * | | submodule: catch when submodule is not staged on updatePatrick Steinhardt2017-03-141-1/+9
| |/ /
* | | Merge branch 'gumenikav/merge_driver_source_info'Patrick Steinhardt2017-03-151-0/+29
|\ \ \
| * | | merge_driver: add unresolved getters for git_merge_driver_sourceGumenik Alexandr2017-03-151-0/+29
* | | | Merge pull request #4146 from pks-t/pks/winhttp-errorsPatrick Steinhardt2017-03-141-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | winhttp: disambiguate error messages when sending requestsPatrick Steinhardt2017-03-011-1/+1
* | | | Merge pull request #4157 from adamniedzielski/4099-git-sort-time-uninterestingCarlos Martín Nieto2017-03-112-3/+26
|\ \ \ \
| * | | | Skip uninteresting commits in revwalk timesort iteratorAdam Niedzielski2017-03-092-3/+26
* | | | | Merge pull request #4156 from libgit2/ethomson/readbuffer_dont_hashCarlos Martín Nieto2017-03-111-15/+16
|\ \ \ \ \
| * | | | | git_futils_readbuffer: don't compute sha-1ethomson/readbuffer_dont_hashEdward Thomson2017-03-091-15/+16
| |/ / / /
* | | | | Merge pull request #4151 from novalis/dturner/rebase-submodule-untrackedEdward Thomson2017-03-0934-1/+190
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | rebase: ignore untracked files in submodulesDavid Turner2017-03-0334-1/+190
| | |/ / | |/| |
* | | | Merge pull request #4154 from libgit2/ethomson/namespacesEdward Thomson2017-03-062-26/+71
|\ \ \ \ | |/ / / |/| | |
| * | | refdb_fs: honor the namespaceethomson/namespacesEdward Thomson2017-03-061-26/+35
| * | | refs::namespace: add namespace testsEdward Thomson2017-03-061-0/+36
|/ / /
* | | Merge pull request #4150 from libgit2/ethomson/freshen_treesCarlos Martín Nieto2017-03-034-19/+90
|\ \ \
| * | | git_commit_create: freshen tree objects in commitethomson/freshen_treesEdward Thomson2017-03-034-19/+90
|/ / /
* | | Merge pull request #4136 from libgit2/ethomson/sha1dcCarlos Martín Nieto2017-03-0312-9/+1815
|\ \ \
| * | | cmake: drop unset `SHA1_TYPE`ethomson/sha1dcEdward Thomson2017-03-031-2/+2
| * | | hash: test for sha1 collision attack detectionEdward Thomson2017-03-033-0/+70
| * | | hash: include sha1collisiondetectionEdward Thomson2017-03-039-3/+1739
| * | | hash: rename implementation selection constantsEdward Thomson2017-03-032-6/+6
|/ / /
* | | 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