aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #985 from mcuadros/checkout-docv4.7.1Máximo Cuadros2018-10-161-2/+3
|\ | | | | repository: improve CheckoutOption.Hash doc
| * repository: improve CheckoutOption.Hash docMáximo Cuadros2018-10-161-2/+3
| | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | Merge pull request #984 from mcuadros/open-bareMáximo Cuadros2018-10-162-14/+9
|\ \ | | | | | | repository: allow open non-bare repositories as bare
| * | repository: allow open non-bare repositories as bareMáximo Cuadros2018-10-152-14/+9
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #986 from mcuadros/fix-blameMáximo Cuadros2018-10-162-5/+42
|\ \ \ | | | | | | | | blame: fix edge case with missing \n in content length causing mismatched length error
| * | | blame: fix edge case with missing \n in content length causing mismatched ↵Máximo Cuadros2018-10-162-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | length error Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | | Merge pull request #982 from keybase/strib/gh-KBFS-3474-object-sizesMáximo Cuadros2018-10-168-0/+168
|\ \ \ \ | |/ / / |/| | | tree: add a Size() method for getting plaintext size
| * | | packfile: add comment on GetSizeByOffsetJeremy Stribling2018-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested by mcuadros. Issue: src-d/go-git#982 Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
| * | | filesystem: add a new test for EncodedObjectSizeJeremy Stribling2018-10-122-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | Suggested by taruti. Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
| * | | tree: add a Size() method for getting plaintext sizeJeremy Stribling2018-10-112-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Without reading the entire object into memory. Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
| * | | object: get object size without reading whole objectJeremy Stribling2018-10-116-0/+137
| | | | | | | | | | | | | | | | Signed-off-by: Jeremy Stribling <strib@alum.mit.edu>
* | | | Merge pull request #830 from novas0x2a/annotatedMáximo Cuadros2018-10-152-11/+54
|\ \ \ \ | |_|_|/ |/| | | Teach ResolveRevision how to look up annotated tags
| * | | teach ResolveRevision how to look up annotated tags, testMáximo Cuadros2018-10-151-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | | Merge branch 'master' of github.com:src-d/go-git into annotatedMáximo Cuadros2018-10-15113-1873/+6283
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #727 from krylovsk/bugfix/references-sort-timestampsMáximo Cuadros2018-10-152-2/+16
|\ \ \ \ | | | | | | | | | | references: sort: compare author timestamps when commit timestamps are equal. Fixes #725
| * | | | references: sort: compare author timestamps when commit timestamps are ↵Máximo Cuadros2018-10-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | equal, test Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | | | Merge branch 'bugfix/references-sort-timestamps' of ↵Máximo Cuadros2018-10-151-1/+3
|/| | | | | | | | | | | | | | | | | | | github.com:krylovsk/go-git into bugfix/references-sort-timestamps
| * | | | references: sort: compare author timestamps when commit timestamps are ↵Alexandr Krylovskiy2018-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | equal. Fixes #725 Signed-off-by: Alexandr Krylovskiy <alexandr.krylovskiy@gmail.com>
* | | | | Merge pull request #828 from fooker/patch-1Máximo Cuadros2018-10-152-5/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | Use remote name in fetch while clone
| * | | | use remote name in fetch while clone, testMáximo Cuadros2018-10-152-1/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | | | Use remote name in fetch while cloneDustin Frisch2018-05-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #827 Signed-off-by: Dustin Frisch <fooker@lab.sh>
* | | | | Plumbing: object, Add support for Log with filenames. Fixes #826 (#979)Nithin Gangadharan2018-10-114-6/+271
| | | | | | | | | | | | | | | plumbing: object, Add support for Log with filenames. Fixes #826
* | | | | Merge pull request #977 from filipnavara/config-testMáximo Cuadros2018-10-091-1/+14
|\ \ \ \ \ | | | | | | | | | | | | config: Add test for Windows local paths.
| * | | | | Add test for Windows local paths.Filip Navara2018-10-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <navara@emclient.com>
* | | | | | Merge pull request #978 from urld/iscleanMáximo Cuadros2018-10-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | git: Fix Status.IsClean() documentation
| * | | | | | git: Fix Status.IsClean() documentationDavid Url2018-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of the IsClean Method contained a negation, so it was describing the opposite of its actual behavior. Fixes #838 Signed-off-by: David Url <david@urld.io>
* | | | | | | Merge pull request #974 from u5surf/issue-813Máximo Cuadros2018-10-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use time.IsZero in Prune
| * | | | | | | use time.IsZero in Pruneu5surf2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: u5surf <u5.horie@gmail.com>
* | | | | | | | Merge pull request #968 from smola/improve-test-weird-userpassMáximo Cuadros2018-10-091-5/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | test: improve test for urlencoded user:pass
| * | | | | | | test: improve test for urlencoded user:passSantiago M. Mola2018-09-271-5/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago M. Mola <santi@mola.io>
* | | | | | | Merge pull request #966 from jmkim/fix-typoMáximo Cuadros2018-09-272-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | all: remove extra 's' in "mismatch"
| * | | | | | all: remove extra 's' in "mismatch"Jongmin Kim2018-09-262-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jongmin Kim <jmkim@pukyong.ac.kr>
* | | | | | Merge pull request #962 from jfontan/fix/do-not-close-files-in-iteratorMáximo Cuadros2018-09-212-12/+64
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | storage/filesystem: keep packs open in PackfileIter
| * | | | | storage/filesystem: add more doc to NewPackfileIterJavi Fontan2018-09-211-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * | | | | storage/filesystem: keep packs open in PackfileIterJavi Fontan2018-09-202-14/+63
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackfileIter was not taking into account the option KeepDescriptors and was always closing the file. This caused "file already closed" errors when iterating packfiles in with KeepDescriptors active. Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | | | | Merge pull request #958 from kuba--/fix-cachesizeMáximo Cuadros2018-09-184-24/+66
|\ \ \ \ \ | | | | | | | | | | | | Fix potential LRU cache size issue.
| * | | | | Remove empty space to trigger windows build.kuba--2018-09-172-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
| * | | | | Fix potential LRU cache size issue.kuba--2018-09-174-22/+68
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: kuba-- <kuba@sourced.tech>
* | | | | travis: drop go1.9 add go1.11Máximo Cuadros2018-09-101-1/+1
| | | | |
* | | | | *: go modules supportMáximo Cuadros2018-09-102-0/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | | | Merge pull request #928 from vancluever/f-add-tagging-supportMáximo Cuadros2018-09-106-69/+662
|\ \ \ \ \ | | | | | | | | | | | | git: Add tagging support
| * | | | | repository: fix test for new Storage constructorMáximo Cuadros2018-09-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * | | | | 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` 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>