aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #932 from flant/fix-negative-range-infoMáximo Cuadros2018-09-102-2/+43
|\ | | | | Fix `fatal: corrupt patch` error in unified diff format
| * Fix fatal corrupt patch in unified diff formatAntonio Jesus Navarro Perez2018-09-072-2/+43
| | | | | | | | Signed-off-by: Antonio Jesus Navarro Perez <antnavper@gmail.com>
* | Merge pull request #949 from kuba--/custom-cacheMáximo Cuadros2018-09-0825-165/+111
|\ \ | | | | | | Expose Storage cache.
| * | Expose Storage cache.kuba--2018-09-0725-165/+111
| |/ | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
* / plumbing/transport: ssh check if list of known_hosts files is emptyKuba Podgórski2018-09-072-7/+69
|/ | | Signed-off-by: kuba-- <kuba@sourced.tech>
* worktree: solve merge conflictsv4.7.0Máximo Cuadros2018-09-062-3/+70
|\
| * worktree: address PR comments: sort imports appropriatelyMark Bartel2018-07-072-6/+6
| | | | | | | | Signed-off-by: Mark Bartel <github@spottybenny.ca>
| * worktree: sort the tree object. Fixes #881Mark Bartel2018-07-031-0/+14
| | | | | | | | Signed-off-by: Mark Bartel <github@spottybenny.ca>
| * worktree: add test for correct tree sorting (issue #881)Mark Bartel2018-07-031-0/+54
| | | | | | | | Signed-off-by: Mark Bartel <github@spottybenny.ca>
* | Merge pull request #942 from jfontan/improvement/maintain-packfiles-openMáximo Cuadros2018-09-065-2/+131
|\ \ | | | | | | storage/dotgit: add KeepDescriptors option
| * | storage/filesystem: compare files using offset in testJavi Fontan2018-09-062-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | Using equals to compare files it uses diff to do so. This can potentially consume lots of ram. Changed the comparison to use file offsets. If the descriptor is reused the offset is maintained. Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | storage/filesystem: add KeepDescriptors testJavi Fontan2018-09-053-7/+31
| | | | | | | | | | | | | | | | | | Also delete Close from MockObjectStorage and memory storer. Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | plumbing/storer: do not expose Close in EncodedObjectStorer interfaceJavi Fontan2018-09-041-2/+0
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | storage/dotgit: add KeepDescriptors optionJavi Fontan2018-09-047-2/+92
|/ / | | | | | | | | | | | | | | | | | | This option maintains packfile file descriptors opened after reading objects from them. It improves performance as it does not have to be opening packfiles each time an object is needed. Also adds Close to EncodedObjectStorer to close all the files manualy. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | Merge pull request #941 from jfontan/improvement/static-modeMáximo Cuadros2018-09-046-9/+260
|\ \ | | | | | | plumbing/storer: add ExclusiveAccess option to Storer
| * | storage/dotgit: add ExclusiveAccess tests in dotgitJavi Fontan2018-09-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | This functionality was already tested in storage/filesystem. The coverage tool only takes into account files from the same package of the test. Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | storage/filesystem: move Options to filesytem and dotgitJavi Fontan2018-09-035-32/+50
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | storage/filesystem: make Storage options privateJavi Fontan2018-09-031-2/+2
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | plumbing/storer: rename Static option to ExclusiveAccessJavi Fontan2018-08-313-8/+9
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | git: do not expose storage options in PlainOpenJavi Fontan2018-08-313-27/+1
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | dotgit: fix typo in commentJavi Fontan2018-08-301-1/+1
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | git, storer: use a common storer.Options for storer and PlainOpenJavi Fontan2018-08-307-38/+33
| | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | git: add Static option to PlainOpenJavi Fontan2018-08-306-10/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds Static configuration to Storage and DotGit. This option means that the git repository is not expected to be modified while open and enables some optimizations. Each time a file is accessed the storer tries to open an object file for the requested hash. When this is done for a lot of objects it is expensive. With Static option a list of object files is generated the first time an object is accessed and used to check if exists instead of using system calls. A similar optimization is done for packfiles. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | Merge pull request #939 from ↵Máximo Cuadros2018-09-042-2/+6
|\ \ \ | | | | | | | | | | | | | | | | keybase/taruti/cherrypick-for-upstream-clamp-object-timestamp Clamp object timestamps before unix epoch to unix epoch
| * | | plumbing: object: Clamp object timestamps before unix epoch to unix epochTaru Karttunen2018-08-292-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Taru Karttunen <taruti@taruti.net>
* | | | Merge pull request #937 from zaquestion/comment_charMáximo Cuadros2018-08-302-0/+7
|\ \ \ \ | | | | | | | | | | config: add commentChar to core config struct
| * | | | config: add commentChar to core config structZaq? Wiedmann2018-08-292-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Zaq? Wiedmann <zaquestion@gmail.com>
* | | | | Merge pull request #933 from kuba--/fix-895/clean-dirMáximo Cuadros2018-08-293-16/+62
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove empty dirs when cleaning with Dir opt.
| * | | | Add Status.IsUntracked functionkuba--2018-08-292-5/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
| * | | | Remove empty dirs when cleaning with Dir opt.kuba--2018-08-293-32/+89
| |/ / / | | | | | | | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
* | | | Merge pull request #935 from jfontan/improvement/cache-incoming-directoryMáximo Cuadros2018-08-291-18/+36
|\ \ \ \ | |/ / / |/| | | storage/dotgit: search for incoming dir only once
| * | | storage/dotgit: use HasPrefix instead of SplitJavi Fontan2018-08-271-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Also reformatted function comment and fixed some typos. Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | | storage/dotgit: search for incoming dir only onceJavi Fontan2018-08-251-13/+28
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Search for incoming object directory was done once each time objects were accessed. This means a ReadDir of the objects path that is expensive. Now incoming directory is searched the first time an object is accessed and its name kept in DotGit to be reused. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | Merge pull request #929 from jfontan/fix/reuse-base-cacheMáximo Cuadros2018-08-233-2/+41
|\ \ \ | | | | | | | | plumbing, storage: add bases to the common cache
| * | | plumbing, storage: add bases to the common cacheJavi Fontan2018-08-223-2/+41
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After clone only resolved deltas were added to the cache. This caused slowdowns in small repositories where most objects can be held in cache. It also makes packfiles reuse delta cache from the store. Previously it created a new delta cache each time a packfile object was created. This also slowed down a bit accessing objects and had an impact on memory consumption when bases are added to the cache. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | 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 order
| * | | plumbing/idxfile: object iterators returns entries in offset orderJavi Fontan2018-08-213-1/+85
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the latest change the order was changed from offset order in packfiles to hash order. This makes reading all the objects not as efficient as before. It also created problems when the previous order was expected. Also added EntriesByOffset to indexes. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | Merge pull request #887 from noxora/hook-supportMáximo Cuadros2018-08-212-3/+101
|\ \ \ | | | | | | | | added support for quarantine directory
| * | | dotgit: fix object delete testSantiago M. Mola2018-08-171-14/+18
| | | | | | | | | | | | | | | | Signed-off-by: Santiago M. Mola <santi@mola.io>
| * | | added hook supportnoxora2018-08-162-4/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: noxora <ldecker@indeed.com> trying a possible fix to the delete test Signed-off-by: noxora <ldecker@indeed.com> still trying to fix this test Signed-off-by: noxora <ldecker@indeed.com> fixes did not work, seems to be a windows env problem Signed-off-by: noxora <ldecker@indeed.com>
* | | | Merge pull request #921 from jfontan/fix/empty-headersMáximo Cuadros2018-08-212-5/+45
|\ \ \ \ | |_|/ / |/| | | plumbing/object: fix panic when reading object header
| * | | object: fix panic when reading object headerJavi Fontan2018-08-172-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the first line of the pgp signature is an empty line or some header is malformed it crashes as there's no data for the header element. For example, if author name is "\n". Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | | Merge pull request #924 from fkorotkov/fedor/fix-issue-923Máximo Cuadros2018-08-202-0/+9
|\ \ \ \ | |/ / / |/| | | Fixed an edge case for .gitignore
| * | | Fixed an edge case for .gitignoreFedor Korotkov2018-08-192-0/+9
|/ / / | | | | | | | | | | | | | | | Fixes #923 Signed-off-by: Fedor Korotkov <fedor.korotkov@gmail.com>
* | | Merge pull request #920 from vancluever/f-add-commit-signkeyv4.6.0Máximo Cuadros2018-08-174-7/+178
|\ \ \ | | | | | | | | git: Add ability to PGP sign commits
| * | | git: Add extra test for testing bad key error caseChris Marchesi2018-08-161-55/+85
| | | | | | | | | | | | | | | | | | | | | | | | I'm hoping this helps get codecov to a tolerable delta. :) Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>
| * | | git: Remove old hash validation codeChris Marchesi2018-08-161-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will not work for a signed commit as with the GPG signature being a part of the commit, the hash is now non-deterministic. Verification of the commit is done through the validation of the signature. Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>
| * | | git: Remove use of strings.BuilderChris Marchesi2018-08-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in Go 1.10 and is not supported on Go 1.9. Switched to bytes.Buffer to ensure compatibility. Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>
| * | | git: Add ability to PGP sign commitsChris Marchesi2018-08-163-0/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to sign commits by adding the SignKey field to CommitOptions. If present, the commit will be signed during the WorkTree.Commit call. The supplied SignKey must already be decrypted by the caller. Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>
| * | | plumbing: object, Don't add new line at end of commit signatureChris Marchesi2018-08-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way that commit signatures were being written out was causing an extra newline to be written at the end of the commit when the message encoding was already taking care of this. Ultimately, this results in a corrupt object, rendering the object unverifiable with the signature in the commit. Signed-off-by: Chris Marchesi <chrism@vancluevertech.com>