summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ctest: temporarily disable UNC path testsethomson/unc_testsEdward Thomson2017-06-071-2/+2
* Merge pull request #4251 from Keruspe/masterPatrick Steinhardt2017-06-071-1/+1
|\
| * openssl_stream: fix building with libresslMarc-Antoine Perennou2017-06-071-1/+1
|/
* Merge branch 'pr/4228'Edward Thomson2017-06-045-31/+192
|\
| * worktree: upgrade lock to an intEdward Thomson2017-06-041-1/+1
| * worktree: switch over worktree pruning to an opts structurePatrick Steinhardt2017-05-054-23/+103
| * worktree: support creating locked worktreesPatrick Steinhardt2017-05-053-1/+43
| * worktree: introduce git_worktree_add optionsPatrick Steinhardt2017-05-024-8/+47
* | Merge pull request #4239 from roblg/toplevel-dir-ignore-fixEdward Thomson2017-06-043-2/+96
|\ \
| * | Fix issue with directory glob ignore in subdirectoriesRobert Gay2017-05-173-2/+96
* | | Merge pull request #4243 from pks-t/pks/submodule-workdirEdward Thomson2017-06-042-38/+149
|\ \ \
| * | | repository: make check if repo is a worktree more strictPatrick Steinhardt2017-05-192-0/+26
| * | | repository: factor out worktree checkPatrick Steinhardt2017-05-191-5/+19
| * | | repository: improve parameter names for `find_repo`Patrick Steinhardt2017-05-191-35/+35
| * | | repository: clear out-parameter instead of freeing itPatrick Steinhardt2017-05-191-1/+1
| * | | tests: add test suite for opening submodulesPatrick Steinhardt2017-05-171-0/+71
* | | | Merge pull request #4179 from libgit2/ethomson/expand_tildeCarlos Martín Nieto2017-05-206-19/+52
|\ \ \ \
| * | | | config: expand paths with `git_sysdir_expand...`ethomson/expand_tildeEdward Thomson2017-03-231-13/+1
| * | | | config::include: sanitize homedirEdward Thomson2017-03-231-0/+3
| * | | | config, attrcache: don't fallback to dirs literally named `~`Edward Thomson2017-03-232-15/+9
| * | | | Introduce `git_sysdir_expand_global_file`Edward Thomson2017-03-232-0/+23
| * | | | fix error when including a missing config file relative to the home directorySim Domingo2017-03-231-2/+10
| * | | | add failing test to include a missing config file relative to home dirSim Domingo2017-03-231-0/+17
* | | | | Merge pull request #4097 from implausible/fix/auto-detect-proxy-callbacksCarlos Martín Nieto2017-05-201-0/+3
|\ \ \ \ \
| * | | | | Do not discard proxy_options that have been set when auto is specifiedtyler wanek2017-01-271-0/+3
* | | | | | Merge pull request #4174 from libgit2/ethomson/set_head_to_tagCarlos Martín Nieto2017-05-202-41/+48
|\ \ \ \ \ \
| * | | | | | git_repository_set_head: use remote name in reflogethomson/set_head_to_tagEdward Thomson2017-04-032-7/+11
| * | | | | | git_repository_set_head: use tag name in reflogEdward Thomson2017-03-212-41/+44
* | | | | | | Merge pull request #4231 from wabain/open-revrangeCarlos Martín Nieto2017-05-202-3/+57
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | revparse: support open-ended rangesWilliam Bain2017-05-052-3/+57
* | | | | | | Merge pull request #4240 from pks-t/pks/fix-gcc-warningsCarlos Martín Nieto2017-05-164-16/+26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | tests: threads::basic: remove unused function `exit_abruptly`Patrick Steinhardt2017-05-151-6/+0
| * | | | | | tests: clone::local: compile UNC functions for Windows onlyPatrick Steinhardt2017-05-151-0/+2
| * | | | | | odb: fix printf formatter for git_off_tPatrick Steinhardt2017-05-151-3/+3
| * | | | | | examples: network: refactor credentials callbackPatrick Steinhardt2017-05-151-5/+19
| * | | | | | odb: shut up gcc warnings regarding uninitilized variablesPatrick Steinhardt2017-05-151-2/+2
* | | | | | | Merge pull request #4238 from libgit2/ethomson/vs_to_vstsCarlos Martín Nieto2017-05-111-4/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update README: VS -> VSTSethomson/vs_to_vstsEdward Thomson2017-05-111-4/+3
|/ / / / / /
* | | | | | Merge pull request #4232 from pks-t/pks/schroot-test-fixesEdward Thomson2017-05-042-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | tests: repo: fix repo discovery tests on overlayfsPatrick Steinhardt2017-05-032-2/+3
|/ / / / /
* | | | | Merge pull request #4229 from pks-t/pks/ssh-memleaksEdward Thomson2017-05-022-2/+14
|\ \ \ \ \
| * | | | | transports: ssh: clean up after libssh2 on exitPatrick Steinhardt2017-05-022-1/+10
| * | | | | transports: ssh: report failure initializing libssh2Patrick Steinhardt2017-05-021-1/+4
|/ / / / /
* | | | | Merge pull request #4226 from libgit2/ethomson/memleakEdward Thomson2017-05-027-16/+29
|\ \ \ \ \
| * | | | | object validation: free some memleaksethomson/memleakEdward Thomson2017-05-012-0/+7
| * | | | | signature: free dup'd buffers on parse errorEdward Thomson2017-05-011-1/+4
| * | | | | remote: free the config snapshotEdward Thomson2017-05-011-8/+8
| * | | | | worktrees: cleanup some memory leaksEdward Thomson2017-05-013-7/+10
|/ / / / /
* | | | | Merge pull request #4197 from pks-t/pks/verify-object-hashesEdward Thomson2017-05-017-25/+162
|\ \ \ \ \
| * | | | | odb: verify hashes in read_prefix_1Patrick Steinhardt2017-04-281-0/+12