aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #928 from vancluever/f-add-tagging-supportMáximo Cuadros2018-09-106-69/+662
|\
| * repository: fix test for new Storage constructorMáximo Cuadros2018-09-101-7/+5
| * Merge branch 'master' of github.com:src-d/go-git into f-add-tagging-supportMáximo Cuadros2018-09-1044-187/+1028
| |\ | |/ |/|
* | Merge pull request #932 from flant/fix-negative-range-infoMáximo Cuadros2018-09-102-2/+43
|\ \
| * | Fix fatal corrupt patch in unified diff formatAntonio Jesus Navarro Perez2018-09-072-2/+43
* | | Merge pull request #949 from kuba--/custom-cacheMáximo Cuadros2018-09-0825-165/+111
|\ \ \
| * | | Expose Storage cache.kuba--2018-09-0725-165/+111
| |/ /
* / / plumbing/transport: ssh check if list of known_hosts files is emptyKuba Podgórski2018-09-072-7/+69
|/ /
* | worktree: solve merge conflictsv4.7.0Máximo Cuadros2018-09-062-3/+70
|\ \
| * | worktree: address PR comments: sort imports appropriatelyMark Bartel2018-07-072-6/+6
| * | worktree: sort the tree object. Fixes #881Mark Bartel2018-07-031-0/+14
| * | worktree: add test for correct tree sorting (issue #881)Mark Bartel2018-07-031-0/+54
* | | Merge pull request #942 from jfontan/improvement/maintain-packfiles-openMáximo Cuadros2018-09-065-2/+131
|\ \ \
| * | | storage/filesystem: compare files using offset in testJavi Fontan2018-09-062-3/+20
| * | | storage/filesystem: add KeepDescriptors testJavi Fontan2018-09-053-7/+31
| * | | plumbing/storer: do not expose Close in EncodedObjectStorer interfaceJavi Fontan2018-09-041-2/+0
| * | | storage/dotgit: add KeepDescriptors optionJavi Fontan2018-09-047-2/+92
|/ / /
* | | Merge pull request #941 from jfontan/improvement/static-modeMáximo Cuadros2018-09-046-9/+260
|\ \ \
| * | | storage/dotgit: add ExclusiveAccess tests in dotgitJavi Fontan2018-09-041-0/+24
| * | | storage/filesystem: move Options to filesytem and dotgitJavi Fontan2018-09-035-32/+50
| * | | storage/filesystem: make Storage options privateJavi Fontan2018-09-031-2/+2
| * | | plumbing/storer: rename Static option to ExclusiveAccessJavi Fontan2018-08-313-8/+9
| * | | git: do not expose storage options in PlainOpenJavi Fontan2018-08-313-27/+1
| * | | dotgit: fix typo in commentJavi Fontan2018-08-301-1/+1
| * | | git, storer: use a common storer.Options for storer and PlainOpenJavi Fontan2018-08-307-38/+33
| * | | git: add Static option to PlainOpenJavi Fontan2018-08-306-10/+249
* | | | Merge pull request #939 from keybase/taruti/cherrypick-for-upstream-clamp-obj...Máximo Cuadros2018-09-042-2/+6
|\ \ \ \
| * | | | plumbing: object: Clamp object timestamps before unix epoch to unix epochTaru Karttunen2018-08-292-2/+6
* | | | | Merge pull request #937 from zaquestion/comment_charMáximo Cuadros2018-08-302-0/+7
|\ \ \ \ \
| * | | | | config: add commentChar to core config structZaq? Wiedmann2018-08-292-0/+7
* | | | | | Merge pull request #933 from kuba--/fix-895/clean-dirMáximo Cuadros2018-08-293-16/+62
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add Status.IsUntracked functionkuba--2018-08-292-5/+12
| * | | | | Remove empty dirs when cleaning with Dir opt.kuba--2018-08-293-32/+89
| |/ / / /
* | | | | Merge pull request #935 from jfontan/improvement/cache-incoming-directoryMáximo Cuadros2018-08-291-18/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | storage/dotgit: use HasPrefix instead of SplitJavi Fontan2018-08-271-6/+9
| * | | | storage/dotgit: search for incoming dir only onceJavi Fontan2018-08-251-13/+28
|/ / / /
* | | | Merge pull request #929 from jfontan/fix/reuse-base-cacheMáximo Cuadros2018-08-233-2/+41
|\ \ \ \
| * | | | plumbing, storage: add bases to the common cacheJavi Fontan2018-08-223-2/+41
|/ / / /
* | | | Merge pull request #927 from jfontan/fix/iterate-objects-by-offsetMáximo Cuadros2018-08-223-1/+85
|\ \ \ \
| * | | | plumbing/idxfile: object iterators returns entries in offset orderJavi Fontan2018-08-213-1/+85
|/ / / /
* | | | Merge pull request #887 from noxora/hook-supportMáximo Cuadros2018-08-212-3/+101
|\ \ \ \
| * | | | dotgit: fix object delete testSantiago M. Mola2018-08-171-14/+18
| * | | | added hook supportnoxora2018-08-162-4/+98
* | | | | Merge pull request #921 from jfontan/fix/empty-headersMáximo Cuadros2018-08-212-5/+45
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | object: fix panic when reading object headerJavi Fontan2018-08-172-5/+45
* | | | | Merge pull request #924 from fkorotkov/fedor/fix-issue-923Máximo Cuadros2018-08-202-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed an edge case for .gitignoreFedor Korotkov2018-08-192-0/+9
|/ / / /
| | | * git: s/TagObjectOptions/CreateTagOptions/Chris Marchesi2018-09-073-13/+13
| | | * git: Add some tests for annotated tag deletionChris Marchesi2018-09-071-3/+110
| | | * git: Don't touch tag objects orphaned by tag deletionChris Marchesi2018-09-071-16/+2