summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* `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 #4124 from pks-t/pks/worktree-refsPatrick Steinhardt2017-02-171-4/+9
|\
| * refdb: catch additional per-worktree refsPatrick Steinhardt2017-02-151-4/+9
* | Merge pull request #4127 from Uncommon/commentEdward Thomson2017-02-161-6/+7
|\ \ | |/ |/|
| * Minor comment fixDavid Catmull2017-02-161-6/+7
|/
* Merge pull request #4122 from pks-t/pks/signature-dbl-freeEdward Thomson2017-02-133-8/+13
|\
| * commit: avoid possible use-after-freePatrick Steinhardt2017-02-131-1/+2
| * commit: clear user-provided buffersPatrick Steinhardt2017-02-132-6/+9
| * buffer: clarify how `git_buf_sanitize` handles non-NULL inputPatrick Steinhardt2017-02-131-1/+2
* | Merge pull request #4115 from gsaralms/users/gsaral/optionalOfsDeltaEdward Thomson2017-02-134-1/+21
|\ \ | |/ |/|
| * Changes to provide option to turn off/on ofs_deltaGaurav Saral2017-02-104-1/+21
* | Merge pull request #3436 from pks-t/libgit2-worktreeEdward Thomson2017-02-1375-123/+2423
|\ \
| * | worktree: extract git_worktree_is_prunablePatrick Steinhardt2017-02-132-7/+35
| * | worktree: test opening worktree via gitlink, gitdir and worktreePatrick Steinhardt2017-02-131-4/+77
| * | worktree: test creating and opening submodule worktreesPatrick Steinhardt2017-02-131-0/+28
| * | worktree: test opening discovered submodule worktreesPatrick Steinhardt2017-02-131-0/+27
| * | worktree: compute workdir for worktrees opened via their gitdirPatrick Steinhardt2017-02-135-12/+66
| * | repository: rename `path_repository` and `path_gitlink`Patrick Steinhardt2017-02-1310-50/+50
| * | repository: restrict checking out checked out branchesPatrick Steinhardt2017-02-132-0/+41
| * | branch: restrict branch deletion for worktreesPatrick Steinhardt2017-02-132-0/+33
| * | branch: implement `git_branch_is_checked_out`Patrick Steinhardt2017-02-132-0/+69
| * | worktree: test basic merge functionalityPatrick Steinhardt2017-02-131-0/+121
| * | worktree: implement functions reading HEADPatrick Steinhardt2017-02-135-1/+175
| * | worktree: implement `git_worktree_prune`Patrick Steinhardt2017-02-133-0/+148
| * | worktree: implement locking mechanismsPatrick Steinhardt2017-02-134-0/+170
| * | worktree: implement `git_worktree_add`Patrick Steinhardt2017-02-133-1/+199
| * | worktree: implement `git_worktree_validate`Patrick Steinhardt2017-02-134-0/+101
| * | worktree: implement `git_repository_open_from_worktree`Patrick Steinhardt2017-02-133-0/+114
| * | worktree: introduce `struct git_worktree`Patrick Steinhardt2017-02-135-1/+167
| * | worktree: implement `git_worktree_list`Patrick Steinhardt2017-02-133-0/+202
| * | repository: expose `repo_init_create_head`Patrick Steinhardt2017-02-132-2/+3
| * | config: open configuration in commondirPatrick Steinhardt2017-02-132-2/+46
| * | refdb: look for reflog in commondirPatrick Steinhardt2017-02-132-1/+66
| * | refdb: introduce commondir awarenessPatrick Steinhardt2017-02-132-6/+96
| * | refdb: rename refdb_fs_backend's .path to .gitpathPatrick Steinhardt2017-02-131-29/+30
| * | repository: introduce is_worktree variablePatrick Steinhardt2017-02-134-0/+31
| * | repository: use `git_repository_item_path`Patrick Steinhardt2017-02-139-27/+48
| * | repository: add function to retrieve paths for repo itemsPatrick Steinhardt2017-02-132-0/+97
| * | repository: introduce commondir variablePatrick Steinhardt2017-02-134-15/+138
| * | tests: implement worktree helpersPatrick Steinhardt2017-02-132-0/+41
| * | tests: add merge-conflict branch for testrepoPatrick Steinhardt2017-02-137-4/+6
| * | tests: add submodule worktree test dataPatrick Steinhardt2017-02-1323-0/+24
| * | tests: add worktree test dataPatrick Steinhardt2017-02-1314-3/+16
* | | Merge pull request #4121 from pks-t/pks/fix-test-index-permissionsPatrick Steinhardt2017-02-131-0/+0
|\ \ \ | |/ / |/| |
| * | tests: fix permissions on testrepo.git index filePatrick Steinhardt2017-02-131-0/+0
|/ /
* | Merge pull request #4112 from cbargren/fix/proxy-env-varsEdward Thomson2017-02-101-2/+6
|\ \
| * | Fixing a code style issueChristopher Bargren2017-02-101-3/+2
| * | Addressing PR feedback Christopher Bargren2017-02-081-12/+5