summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4260 from libgit2/ethomson/forced_checkout_2Edward Thomson2017-06-112-4/+5
|\
| * git_futils_rmdir: only allow `EBUSY` when askedethomson/forced_checkout_2Edward Thomson2017-06-101-0/+3
| * checkout: cope with untracked files in directory deletionEdward Thomson2017-06-101-4/+2
* | settings: rename `GIT_OPT_ENABLE_SYNCHRONOUS_OBJECT_CREATION`Patrick Steinhardt2017-06-088-7/+9
* | Merge pull request #4255 from pks-t/pks/buffer-grow-errorsEdward Thomson2017-06-085-20/+21
|\ \
| * | buffer: use `git_buf_init` with lengthPatrick Steinhardt2017-06-082-4/+8
| * | buffer: return errors for `git_buf_init` and `git_buf_attach`Patrick Steinhardt2017-06-082-8/+10
| * | buffer: consistently use `ENSURE_SIZE` to grow buffers on-demandPatrick Steinhardt2017-06-081-5/+2
| * | buffer: fix `ENSURE_SIZE` macro referencing wrong variablePatrick Steinhardt2017-06-081-1/+1
| * | buffer: rely on `GITERR_OOM` set by `git_buf_try_grow`Patrick Steinhardt2017-06-082-2/+0
* | | Merge pull request #4253 from pks-t/pks/cov-fixesEdward Thomson2017-06-085-15/+31
|\ \ \
| * | | refdb_fs: be explicit about using null-OID if we cannot resolve refPatrick Steinhardt2017-06-081-2/+3
| * | | path: only set dotgit flags when configs were readPatrick Steinhardt2017-06-081-4/+5
| * | | worktree: use `git__free` instead of `free`Patrick Steinhardt2017-06-081-1/+1
| * | | refs: properly report errors from `update_wt_heads`Patrick Steinhardt2017-06-081-6/+16
| * | | fileops: check return value of `git_path_dirname`Patrick Steinhardt2017-06-081-2/+6
| |/ /
* | | Merge pull request #4258 from pks-t/pks/sha1dc-updateEdward Thomson2017-06-084-52/+136
|\ \ \
| * | | sha1dc: update to fix errors with endianess and unaligned accessPatrick Steinhardt2017-06-074-52/+136
* | | | Merge pull request #4236 from pks-t/pks/index-v4-fixesEdward Thomson2017-06-072-43/+76
|\ \ \ \ | |/ / / |/| | |
| * | | index: verify we have enough space left when writing index entriesPatrick Steinhardt2017-06-061-4/+23
| * | | index: fix shared prefix computation when writing index entryPatrick Steinhardt2017-06-061-2/+1
| * | | index: also sanity check entry size with compressed entriesPatrick Steinhardt2017-06-061-4/+3
| * | | index: remove file-scope entry size macrosPatrick Steinhardt2017-06-061-6/+4
| * | | index: don't right-pad paths when writing compressed entriesPatrick Steinhardt2017-06-061-4/+3
| * | | index: move index entry size computation into its own functionPatrick Steinhardt2017-06-061-5/+17
| * | | index: set last written index entry in foreach-entry-loopPatrick Steinhardt2017-06-061-7/+8
| * | | index: set last entry when reading compressed entriesPatrick Steinhardt2017-06-061-4/+7
| * | | index: fix confusion with shared prefix in compressed path namesPatrick Steinhardt2017-06-061-9/+12
| * | | varint: fix computation for remaining buffer spacePatrick Steinhardt2017-06-061-1/+1
| |/ /
* | | openssl_stream: fix building with libresslMarc-Antoine Perennou2017-06-071-1/+1
|/ /
* | Merge branch 'pr/4228'Edward Thomson2017-06-041-7/+66
|\ \
| * | worktree: switch over worktree pruning to an opts structurePatrick Steinhardt2017-05-051-6/+33
| * | worktree: support creating locked worktreesPatrick Steinhardt2017-05-051-0/+15
| * | worktree: introduce git_worktree_add optionsPatrick Steinhardt2017-05-021-1/+18
* | | Merge pull request #4239 from roblg/toplevel-dir-ignore-fixEdward Thomson2017-06-041-2/+6
|\ \ \
| * | | Fix issue with directory glob ignore in subdirectoriesRobert Gay2017-05-171-2/+6
* | | | Merge pull request #4243 from pks-t/pks/submodule-workdirEdward Thomson2017-06-041-38/+59
|\ \ \ \
| * | | | repository: make check if repo is a worktree more strictPatrick Steinhardt2017-05-191-0/+7
| * | | | 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
* | | | | Merge pull request #4179 from libgit2/ethomson/expand_tildeCarlos Martín Nieto2017-05-205-19/+32
|\ \ \ \ \
| * | | | | config: expand paths with `git_sysdir_expand...`ethomson/expand_tildeEdward Thomson2017-03-231-13/+1
| * | | | | 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
* | | | | | 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-201-37/+40
|\ \ \ \ \ \ \
| * | | | | | | git_repository_set_head: use remote name in reflogethomson/set_head_to_tagEdward Thomson2017-04-031-2/+4
View Lorry Controller Status