Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | dotgit: fix up PackRefs comment for upstreaming | Jeremy Stribling | 2017-11-29 | 1 | -26/+8 | |
| | | ||||||
| * | filesystem: implement PackRefs() | Jeremy Stribling | 2017-11-29 | 5 | -0/+205 | |
| | | | | | | | | | | | | | | | | | | | | Currently this implementation is only valid for kbfsgit, since it assumes some things about the filesystem not being updated during the packing, and about conflict resolution rules. In the future, it would be nice to replace this with a more general one, and move this kbfsgit-optimized implementation into kbfsgit. Issue: KBFS-2517 | |||||
* | | Merge pull request #668 from src-d/eiso-patch-1 | Máximo Cuadros | 2017-11-29 | 1 | -7/+6 | |
|\ \ | |/ |/| | Updating the outdated README example to the new one | |||||
| * | Updating the outdated example to the new one | Eiso Kant | 2017-11-29 | 1 | -7/+6 | |
| | | ||||||
* | | Merge pull request #667 from ferhatelmas/simplify | Máximo Cuadros | 2017-11-29 | 27 | -118/+56 | |
|\ \ | | | | | | | all: simplification | |||||
| * | | all: simplification | ferhat elmas | 2017-11-29 | 27 | -118/+56 | |
|/ / | | | | | | | | | | | | | | | | | | | - no length for map initialization - don't check for boolean/error return - don't format string - use string method of bytes buffer instead of converting bytes to string - use `strings.Contains` instead of `strings.Index` - use `bytes.Equal` instead of `bytes.Compare` | |||||
* | | Merge pull request #665 from keybase/strib/gh-fast-forward-fetch | Máximo Cuadros | 2017-11-29 | 10 | -22/+205 | |
|\ \ | | | | | | | remote: support for non-force, fast-forward-only fetches | |||||
| * | | dotgit: add CheckAndSetReference tests | Jeremy Stribling | 2017-11-28 | 4 | -13/+50 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'src-d/master' into gh-fast-forward-fetch | Jeremy Stribling | 2017-11-28 | 2 | -6/+76 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #666 from keybase/strib/delete-from-packed-ref | Jeremy Stribling | 2017-11-28 | 2 | -6/+76 | |
|\ \ \ | | | | | | | | | dotgit: handle refs that exist in both packed-refs and a loose ref file | |||||
| * | | | dotgit: don't list references twice | Jeremy Stribling | 2017-11-27 | 2 | -4/+20 | |
| | | | | | | | | | | | | | | | | Restore the `seen` map that avoided listing packed-refs twice. | |||||
| * | | | dotgit: add a test for removing a ref from a file and packed-refs | Jeremy Stribling | 2017-11-27 | 1 | -0/+29 | |
| | | | | ||||||
| * | | | dotgit: remove loose ref AND packed ref, if both exist | Jeremy Stribling | 2017-11-27 | 1 | -3/+28 | |
|/ / / | | | | | | | | | | Issue: KBFS-2509 | |||||
| * | | remote: add test for non-force, fast-forward fetching | Jeremy Stribling | 2017-11-27 | 1 | -0/+42 | |
| | | | ||||||
| * | | Fetch - honor per refspec force flag | Taru Karttunen | 2017-11-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Document Lock+Close usage | Taru Karttunen | 2017-11-27 | 1 | -0/+4 | |
| | | | ||||||
| * | | Use optionally locking when updating refs | Taru Karttunen | 2017-11-27 | 7 | -18/+87 | |
| | | | ||||||
| * | | Support non-force fetches | Nick Thomas | 2017-11-27 | 3 | -2/+33 | |
|/ / | ||||||
* | | Merge pull request #664 from orirawlings/fixTruncatedDoc | Máximo Cuadros | 2017-11-27 | 1 | -1/+1 | |
|\ \ | | | | | | | plumbing/transport: Fix truncated comment in Endpoint | |||||
| * | | plumbing/transport: Fix truncated comment in Endpoint | Ori Rawlings | 2017-11-27 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #661 from ferhatelmas/ineffassign | Máximo Cuadros | 2017-11-27 | 8 | -2/+23 | |
|\ \ | | | | | | | all: fixes for ineffective assign | |||||
| * | | all: fixes for ineffective assign | ferhat elmas | 2017-11-26 | 8 | -2/+23 | |
|/ / | ||||||
* | | Merge pull request #659 from ferhatelmas/verify-commit-compat-doc | Ori Rawlings | 2017-11-24 | 1 | -2/+2 | |
|\ \ | | | | | | | doc: Update compatibility for commit/tag verify | |||||
| * | | doc: Update compatibility for commit/tag verify | ferhat elmas | 2017-11-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | For #653 and #658 | |||||
* | | | Merge pull request #658 from darkowlzz/tag_sign_and_verify | Ori Rawlings | 2017-11-24 | 3 | -7/+172 | |
|\ \ \ | |/ / |/| | | plumbing: object/tag, add signature and verification support | |||||
| * | | plumbing: object/{commit,tag}, encode method with sig optional | Sunny | 2017-11-24 | 2 | -11/+14 | |
| | | | | | | | | | | | | | | | Adds Commit.encode() and Tag.encode() with optional `includeSig` parameter to include or exclude signature from the encoded object. | |||||
| * | | plumbing: object/tag, add signature verification | Sunny | 2017-11-24 | 2 | -0/+94 | |
| | | | ||||||
| * | | plumbing: object/tag, add PGPSignature support | Sunny | 2017-11-24 | 2 | -1/+69 | |
|/ / | ||||||
* | | Merge pull request #657 from ajnavarro/fix/close-http-response | Máximo Cuadros | 2017-11-24 | 1 | -1/+3 | |
|\ \ | | | | | | | plumbing: transport/http, Close http.Body reader when needed | |||||
| * | | Close http.Body reader when needed | Antonio Jesus Navarro Perez | 2017-11-24 | 1 | -1/+3 | |
|/ / | | | | | | | If we don't do that, all the goroutines opened by the Body Reader are never closed, causing a 'fatal: morestack on g0' error. | |||||
* | | Merge pull request #656 from darkowlzz/debug-commit-verify | Máximo Cuadros | 2017-11-24 | 1 | -2/+3 | |
|\ \ | | | | | | | plumbing: object, fix Commit.Verify test | |||||
| * | | test: plumbing/object fix Commit.Verify test | Sunny | 2017-11-24 | 1 | -2/+3 | |
|/ / | | | | | | | | | Test was failing because of the relative time zone attached to the commit. Adding a fixed location to the time fixes the issue. | |||||
* | | Merge pull request #653 from darkowlzz/verify-commit | Máximo Cuadros | 2017-11-24 | 2 | -0/+95 | |
|\ \ | | | | | | | plumbing: object, new Commit.Verify method | |||||
| * | | test: plumbing.object, add test for Commit.Verify | Sunny | 2017-11-23 | 1 | -0/+65 | |
| | | | ||||||
| * | | plumbing: object, add Commit.Verify method | Sunny | 2017-11-23 | 1 | -0/+30 | |
| | | | | | | | | | | | | | | | Commit.Verify() performs PGP verification of a signed commit given an armored keyring. | |||||
* | | | Merge pull request #655 from mcuadros/billy.v4 | Máximo Cuadros | 2017-11-24 | 57 | -89/+84 | |
|\ \ \ | | | | | | | | | *: update to go-billy.v4 and go-git-fixtures.v3 | |||||
| * | | | update to go-billy.v4 and go-git-fixtures.v3 | Máximo Cuadros | 2017-11-23 | 57 | -89/+84 | |
|/ / / | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | | Merge pull request #652 from ferhatelmas/err-return-on-tree-decode | Ori Rawlings | 2017-11-22 | 2 | -2/+39 | |
|\ \ \ | |/ / |/| | | plumbing/object: do not eat error on tree decode | |||||
| * | | plumbing/object: add test for finding tree entry | ferhat elmas | 2017-11-22 | 1 | -0/+37 | |
| | | | ||||||
| * | | plumbing/object: do not eat error on tree decode | ferhat elmas | 2017-11-21 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #649 from mcuadros/auth | Máximo Cuadros | 2017-11-21 | 5 | -55/+59 | |
|\ \ | | | | | | | transport: made public all the fields and standardized AuthMethod | |||||
| * | | transport: made public all the fields and standardize AuthMethod | Máximo Cuadros | 2017-11-21 | 5 | -55/+59 | |
|/ / | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | Merge pull request #650 from mcuadros/endpoint | Máximo Cuadros | 2017-11-21 | 25 | -269/+278 | |
|\ \ | | | | | | | transport: converts Endpoint interface into a struct | |||||
| * | | *: add pointer to the new transport.Endpoint struct | Máximo Cuadros | 2017-11-21 | 23 | -102/+83 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
| * | | transport: converts Endpoint interface into a struct | Máximo Cuadros | 2017-11-21 | 2 | -167/+195 | |
| | | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | | Merge pull request #651 from erizocosmico/fix/remove-ref-cache | Máximo Cuadros | 2017-11-21 | 1 | -48/+29 | |
|\ \ \ | |/ / |/| | | dotgit: remove ref cache for packed refs | |||||
| * | | dotgit: remove ref cache for packed refs | Miguel Molina | 2017-11-21 | 1 | -48/+29 | |
|/ / | | | | | | | Signed-off-by: Miguel Molina <miguel@erizocosmi.co> | |||||
* | | transport: git and http, full mocked tests | Máximo Cuadros | 2017-11-20 | 2 | -8/+7 | |
| | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | transport: git and http, full mocked tests | Máximo Cuadros | 2017-11-20 | 6 | -243/+211 | |
| | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | |||||
* | | transport: ssh, mocked SSH server, fixes #332 | Máximo Cuadros | 2017-11-20 | 2 | -25/+108 | |
| | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> |