aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* examples: commit, fixed minor typo in info statementHashedDan2019-04-151-1/+1
| | | | Signed-off-by: HashedDan <georgedanielmangum@gmail.com>
* Merge pull request #1095 from niukuo/panic_find_entryMáximo Cuadros2019-04-022-1/+4
|\ | | | | fix panic in object.Tree.FindEntry
| * fix panic in object.Tree.FindEntryniukuo2019-03-272-1/+4
| | | | | | | | Signed-off-by: niukuo <niukuo@gmail.com>
* | Merge pull request #1099 from dpordomingo/go1.12-supportMáximo Cuadros2019-04-021-1/+1
|\ \ | |/ |/| travis: drop go1.10 add go1.12
| * travis: drop go1.10 add go1.12David Pordomingo2019-03-291-1/+1
|/ | | | Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>
* Merge pull request #1092 from niukuo/masterMáximo Cuadros2019-03-251-1/+1
|\ | | | | fix missing error in bfsCommitIterator
| * fix missing error in bfsCommitIteratorniukuo2019-03-211-1/+1
| | | | | | | | Signed-off-by: niukuo <niukuo@gmail.com>
* | Merge pull request #1094 from niukuo/remote_anonymousMáximo Cuadros2019-03-252-0/+47
|\ \ | | | | | | add Repository.CreateRemoteAnonymous
| * | add Repository.CreateRemoteAnonymousniukuo2019-03-222-0/+47
| |/ | | | | | | Signed-off-by: niukuo <niukuo@gmail.com>
* | Merge pull request #1093 from jfontan/transactional-packfilewriter-interfaceMáximo Cuadros2019-03-222-9/+67
|\ \ | |/ |/| transactional: implement storer.PackfileWriter
| * transactional: implement storer.PackfileWriterJavi Fontan2019-03-212-9/+67
| | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | Merge pull request #1084 from vmarkovtsev/masterMáximo Cuadros2019-03-201-1/+17
|\ \ | |/ |/| Increase diffmatchcpatch timeout
| * Add diff.DoWithTimeout()Vadim Markovtsev2019-03-131-2/+16
| | | | | | | | Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
| * Increase diffmatchcpatch timeoutVadim Markovtsev2019-03-101-0/+2
| | | | | | | | | | | | Fixes https://github.com/src-d/go-git/issues/1083 Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
* | Merge pull request #1081 from ↵Máximo Cuadros2019-03-111-11/+0
|\ \ | |/ |/| | | | | meinto/fix/tobias/potentially-duplicate-check-for-unstaged-files git: remove potentially duplicate check for unstaged files
| * git: remove potentially duplicate check for unstaged filesTobias Meinhardt2019-03-051-11/+0
|/ | | | Signed-off-by: Tobias Meinhardt <tobias.meinhardt89@gmail.com>
* Merge pull request #1072 from jeremyschlatter/patch-3Máximo Cuadros2019-03-041-1/+1
|\ | | | | git: Fix typo
| * git: Fix typoJeremy Schlatter2019-02-221-1/+1
| | | | | | Signed-off-by: Jeremy Schlatter <jeremy.schlatter@gmail.com>
* | Merge pull request #1073 from jeremyschlatter/patch-2Máximo Cuadros2019-03-041-1/+1
|\ \ | | | | | | git: Fix typo
| * | git: Fix typoJeremy Schlatter2019-02-221-1/+1
| |/ | | | | Signed-off-by: Jeremy Schlatter <jeremy.schlatter@gmail.com>
* | Merge pull request #1070 from fbsb/fix/enable-excluded-patternsMáximo Cuadros2019-03-042-1/+33
|\ \ | | | | | | worktree: allow manual ignore patterns when no .gitignore is available
| * | worktree: test hardcoded excludes when no gitignore is presentFabian Sabau2019-03-041-0/+28
| | | | | | | | | | | | Signed-off-by: Fabian Sabau <fabian.sabau+git@gmail.com>
| * | worktree: enable manual ignore patterns when no .gitignore is availableFabian Sabau2019-03-041-1/+5
|/ / | | | | | | Signed-off-by: Fabian Sabau <fabian.sabau+git@gmail.com>
* | Merge pull request #1080 from jfontan/fix/blocked-goroutine-remote-pushMáximo Cuadros2019-03-042-1/+17
|\ \ | | | | | | git: fix goroutine block while pushing a remote
| * | git: fix goroutine block while pushing a remoteJavi Fontan2019-03-012-1/+17
|/ / | | | | | | | | | | | | | | | | On session.ReceivePack error the gororutine doing the encoding got blocked either writing objects to the pipe or sending error to the done channel. The problem did not cause a perceived problem but left blocked goroutines. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | Merge pull request #1076 from jfontan/panic-cacheMáximo Cuadros2019-02-262-1/+19
|\ \ | |/ |/| plumbing/cache: check for empty cache list
| * plumbing/cache: check for empty cache listJavi Fontan2019-02-252-1/+19
|/ | | | | | | | If there is wrong data in the cache it may cause the eviction code to empty the object list and cause a panic. This patch adds a check and sets the cache usage to 0 when this happens. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* Merge pull request #1065 from vmarkovtsev/fix-unicodev4.10.0Máximo Cuadros2019-02-144-14/+62
|\ | | | | Remove Unicode normalization in difftree
| * Remove Unicode normalization in difftreeVadim Markovtsev2019-02-114-14/+62
| | | | | | | | | | | | Fixes #1057 Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
* | Merge pull request #1067 from ajnavarro/fix/log-all-missing-objectsMáximo Cuadros2019-02-132-11/+85
|\ \ | | | | | | Ignore missing references/objects on log --all
| * | Improve error handling logicAntonio Jesus Navarro Perez2019-02-131-4/+4
| | | | | | | | | | | | Signed-off-by: Antonio Jesus Navarro Perez <antnavper@gmail.com>
| * | Ignore missing references on log --allAntonio Jesus Navarro Perez2019-02-122-11/+85
| | | | | | | | | | | | | | | | | | To mimic the actual standard git behavior, we must ignore references that are pointing to wrong/unexistent objects. Signed-off-by: Antonio Jesus Navarro Perez <antnavper@gmail.com>
* | | Merge pull request #1066 from keybase/strib/909-git-push-speedup-when-localJeremy Stribling2019-02-136-17/+104
|\ \ \ | | | | | | | | remote: speed up pushes when the "remote" repo is local
| * | | remote: when pushing to a local repo, use local store for ignoresJeremy Stribling2019-02-111-1/+14
| | | | | | | | | | | | | | | | | | | | Issue: #909 Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
| * | | config: add a way to see if a "remote" URL is local or notJeremy Stribling2019-02-113-14/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This factors out some URL-parsing code from the transport layer so it can be used by config as well. Issue: #909 Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
| * | | revlist: add `ObjectsWithStorageForIgnores` methodJeremy Stribling2019-02-112-2/+40
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ObjectsWithStorageForIgnores` is the same as `Objects`, but a secondary storage layer can be provided, to be used to finding the full set of objects to be ignored while finding the reachable objects. This is useful when the main `s` storage layer is slow and/or remote, while the ignore list is available somewhere local. Issue: #909 Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
* | | Merge pull request #1064 from asv/sentinel_error_for_no_ff_updateMáximo Cuadros2019-02-082-6/+7
|\ \ \ | | | | | | | | worktree: add sentinel error for non-fast-forward pull
| * | | worktree: add sentinel error for non-fast-forward pullAlexey Smirnov2019-02-072-6/+7
|/ / / | | | | | | | | | Signed-off-by: Alexey Smirnov <unlinkat@gmail.com>
* | | Merge pull request #1060 from keybase/strib/gh-KBFS-3828-packfile-object-sizeMáximo Cuadros2019-02-052-1/+27
|\ \ \ | | | | | | | | packfile: get object size correctly for delta objects
| * | | packfile: get object size correctly for delta objectsJeremy Stribling2019-01-312-1/+27
| |/ / | | | | | | | | | Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
* | | Merge pull request #1006 from mcuadros/transactional-storageMáximo Cuadros2019-02-0220-8/+1161
|\ \ \ | |/ / |/| | storage: transactional, new storage with transactional capabilities
| * | storage: transactional, package documentationMáximo Cuadros2019-02-028-21/+75
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | storage: transactional, new storage with transactional capabilitiesMáximo Cuadros2018-12-1014-7/+675
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | storage: new storage.ErrReferenceHasChanged error and test for ↵Máximo Cuadros2018-12-104-3/+58
| | | | | | | | | | | | | | | | | | CheckAndSetReference Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | plumbing: storer, new NewMultiReferenceIterMáximo Cuadros2018-10-312-2/+89
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | storage: transactional, new storage with transactional capabilities (WIP)Máximo Cuadros2018-10-296-1/+290
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #1056 from jfontan/fix/lose-objects-shared-cachev4.9.1Máximo Cuadros2019-01-302-5/+21
|\ \ \ | | | | | | | | storage/filesystem: check file object before using cache
| * | | storage/filesystem: check file object before using cacheJavi Fontan2019-01-302-5/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | If the cache is shared between several repositories getFromUnpacked can erroneously return an object from other repository. This decreases performance a little bit as there's an extra fs operation when the object is in the cache but is correct when the cache is shared. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | Merge pull request #1045 from kuba--/enh-1024/log-allv4.9.0Máximo Cuadros2019-01-115-32/+357
|\ \ \ | | | | | | | | Implement git log --all
| * | | Refine Log.kuba--2019-01-103-132/+168
| | | | | | | | | | | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
generated by cgit (git 2.34.1) at 2024-09-21 12:24:56 +0000