summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4178 from libgit2/ethomson/enfasten_sha1enterprise/backport-2.7-4136-4178Carlos Martín Nieto2017-03-285-230/+887
* Merge pull request #4136 from libgit2/ethomson/sha1dcCarlos Martín Nieto2017-03-2812-9/+1815
* Merge pull request #3808 from ethomson/read_index_fixesEdward Thomson2016-06-0210-1/+151
|\
| * index_read_index: invalidate new paths in tree cacheEdward Thomson2016-06-021-0/+6
| * rebase: test rebasing a new commit with subfolderEdward Thomson2016-06-028-0/+83
| * test: ensure we can round-trip a written treeEdward Thomson2016-06-021-0/+23
| * index_read_index: set flags for path_len correctlyEdward Thomson2016-06-021-0/+3
| * index_read_index: differentiate on modeEdward Thomson2016-06-021-1/+2
| * index_read_index: reset error correctlyEdward Thomson2016-06-021-0/+2
| * round-trip trees through index_read_indexEdward Thomson2016-06-021-0/+32
|/
* Merge pull request #3796 from mmuman/haikuEdward Thomson2016-06-011-0/+4
|\
| * CMakeLists: Add libnetwork for HaikuFrançois Revol2016-05-221-0/+4
* | Merge pull request #3801 from ethomson/warningEdward Thomson2016-06-015-9/+11
|\ \
| * | win32: clean up unused warnings in DllMainEdward Thomson2016-06-011-0/+3
| * | rebase: change assertion to avoidEdward Thomson2016-06-011-4/+1
| * | filebuf: fix uninitialized warningEdward Thomson2016-06-011-1/+1
| * | checkout: drop unused repoEdward Thomson2016-06-011-4/+3
| * | cleanup: unused warningEdward Thomson2016-06-011-0/+3
|/ /
* | Merge pull request #3803 from glensc/patch-1Edward Thomson2016-05-271-1/+1
|\ \
| * | Update CMakeLists.txtElan Ruusamäe2016-05-271-1/+1
|/ /
* | Merge pull request #3799 from sschuberth/masterEdward Thomson2016-05-261-1/+1
|\ \
| * | Use AppVeyor's Start-FileDownload cmdletSebastian Schuberth2016-05-251-1/+1
* | | Merge pull request #3798 from mmuman/stat-test-fixEdward Thomson2016-05-261-2/+3
|\ \ \
| * | | test: Fix stat() test to mask out unwanted bitsFrançois Revol2016-05-241-2/+3
| |/ /
* | | Merge branch 'checkout_submodules'Edward Thomson2016-05-264-10/+105
|\ \ \
| * | | Ignore submodules when checking for merge conflicts in the workdir.Jason Haslam2016-05-261-0/+1
| * | | checkout: handle dirty submodules correctlyJason Haslam2016-05-263-10/+104
|/ / /
* | | Merge pull request #3792 from edquist/miscEdward Thomson2016-05-261-1/+1
|\ \ \ | |/ / |/| |
| * | Fix comment for GIT_FILEMODE_LINKCarl Edquist2016-05-181-1/+1
| |/
* | Merge pull request #3797 from libgit2/cmn/remove-single-entryCarlos Martín Nieto2016-05-242-0/+41
|\ \
| * | tree: handle removal of all entries in the updatercmn/remove-single-entryCarlos Martín Nieto2016-05-242-0/+41
|/ /
* | Merge pull request #3794 from libgit2/cmn/tree-update-basenameCarlos Martín Nieto2016-05-232-13/+51
|\ \ | |/ |/|
| * tree: plug leaks in the tree updatercmn/tree-update-basenameCarlos Martín Nieto2016-05-192-4/+13
| * tree: use the basename for the entry removalCarlos Martín Nieto2016-05-191-1/+1
| * tree: use testrepo2 for the tree updater testsCarlos Martín Nieto2016-05-191-9/+38
|/
* Merge pull request #3770 from libgit2/cmn/tree-updateEdward Thomson2016-05-183-0/+458
|\
| * Introduce a function to create a tree based on a different onecmn/tree-updateCarlos Martín Nieto2016-05-173-0/+458
|/
* Merge pull request #3767 from pks-t/pks/misc-fixesEdward Thomson2016-05-096-23/+21
|\
| * diff: simplify code for handling empty dirsPatrick Steinhardt2016-05-031-10/+6
| * delta-apply: fix sign extensionPatrick Steinhardt2016-05-021-5/+5
| * odb_loose: fix undefined behavior when computing sizePatrick Steinhardt2016-05-021-1/+1
| * checkout: set ignorecase=0 when config lookup failsPatrick Steinhardt2016-05-021-2/+4
| * merge_file: do not unnecessarily check ours/theirs for NULLPatrick Steinhardt2016-05-021-4/+4
| * index: fix memory leak on error casePatrick Steinhardt2016-05-021-1/+1
* | Merge pull request #3773 from lucasderraugh/patch-1Edward Thomson2016-05-081-0/+1
|\ \
| * | Fix unused variable 'message' warningLucas Derraugh2016-05-051-0/+1
* | | Merge pull request #3757 from johnhaley81/jh/fix-create-initial-commitCarlos Martín Nieto2016-05-062-1/+61
|\ \ \ | |/ / |/| |
| * | Fix initial commit testJohn Haley2016-05-041-30/+5
| * | Add tests for creating an initial commitJohn Haley2016-05-031-0/+85
| * | Fix `git_commit_create` for an initial commitJohn Haley2016-05-031-1/+1