aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* all: simplificationferhat elmas2017-11-2927-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-fetchMáximo Cuadros2017-11-2910-22/+205
|\ | | | | remote: support for non-force, fast-forward-only fetches
| * dotgit: add CheckAndSetReference testsJeremy Stribling2017-11-284-13/+50
| |
| * Merge remote-tracking branch 'src-d/master' into gh-fast-forward-fetchJeremy Stribling2017-11-282-6/+76
| |\ | |/ |/|
* | Merge pull request #666 from keybase/strib/delete-from-packed-refJeremy Stribling2017-11-282-6/+76
|\ \ | | | | | | dotgit: handle refs that exist in both packed-refs and a loose ref file
| * | dotgit: don't list references twiceJeremy Stribling2017-11-272-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-refsJeremy Stribling2017-11-271-0/+29
| | |
| * | dotgit: remove loose ref AND packed ref, if both existJeremy Stribling2017-11-271-3/+28
|/ / | | | | | | Issue: KBFS-2509
| * remote: add test for non-force, fast-forward fetchingJeremy Stribling2017-11-271-0/+42
| |
| * Fetch - honor per refspec force flagTaru Karttunen2017-11-271-1/+1
| |
| * Document Lock+Close usageTaru Karttunen2017-11-271-0/+4
| |
| * Use optionally locking when updating refsTaru Karttunen2017-11-277-18/+87
| |
| * Support non-force fetchesNick Thomas2017-11-273-2/+33
|/
* Merge pull request #664 from orirawlings/fixTruncatedDocMáximo Cuadros2017-11-271-1/+1
|\ | | | | plumbing/transport: Fix truncated comment in Endpoint
| * plumbing/transport: Fix truncated comment in EndpointOri Rawlings2017-11-271-1/+1
|/
* Merge pull request #661 from ferhatelmas/ineffassignMáximo Cuadros2017-11-278-2/+23
|\ | | | | all: fixes for ineffective assign
| * all: fixes for ineffective assignferhat elmas2017-11-268-2/+23
|/
* Merge pull request #659 from ferhatelmas/verify-commit-compat-docOri Rawlings2017-11-241-2/+2
|\ | | | | doc: Update compatibility for commit/tag verify
| * doc: Update compatibility for commit/tag verifyferhat elmas2017-11-241-2/+2
| | | | | | | | For #653 and #658
* | Merge pull request #658 from darkowlzz/tag_sign_and_verifyOri Rawlings2017-11-243-7/+172
|\ \ | |/ |/| plumbing: object/tag, add signature and verification support
| * plumbing: object/{commit,tag}, encode method with sig optionalSunny2017-11-242-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 verificationSunny2017-11-242-0/+94
| |
| * plumbing: object/tag, add PGPSignature supportSunny2017-11-242-1/+69
|/
* Merge pull request #657 from ajnavarro/fix/close-http-responseMáximo Cuadros2017-11-241-1/+3
|\ | | | | plumbing: transport/http, Close http.Body reader when needed
| * Close http.Body reader when neededAntonio Jesus Navarro Perez2017-11-241-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-verifyMáximo Cuadros2017-11-241-2/+3
|\ | | | | plumbing: object, fix Commit.Verify test
| * test: plumbing/object fix Commit.Verify testSunny2017-11-241-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-commitMáximo Cuadros2017-11-242-0/+95
|\ | | | | plumbing: object, new Commit.Verify method
| * test: plumbing.object, add test for Commit.VerifySunny2017-11-231-0/+65
| |
| * plumbing: object, add Commit.Verify methodSunny2017-11-231-0/+30
| | | | | | | | | | Commit.Verify() performs PGP verification of a signed commit given an armored keyring.
* | Merge pull request #655 from mcuadros/billy.v4Máximo Cuadros2017-11-2457-89/+84
|\ \ | | | | | | *: update to go-billy.v4 and go-git-fixtures.v3
| * | update to go-billy.v4 and go-git-fixtures.v3Máximo Cuadros2017-11-2357-89/+84
|/ / | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | Merge pull request #652 from ferhatelmas/err-return-on-tree-decodeOri Rawlings2017-11-222-2/+39
|\ \ | |/ |/| plumbing/object: do not eat error on tree decode
| * plumbing/object: add test for finding tree entryferhat elmas2017-11-221-0/+37
| |
| * plumbing/object: do not eat error on tree decodeferhat elmas2017-11-211-2/+2
|/
* Merge pull request #649 from mcuadros/authMáximo Cuadros2017-11-215-55/+59
|\ | | | | transport: made public all the fields and standardized AuthMethod
| * transport: made public all the fields and standardize AuthMethodMáximo Cuadros2017-11-215-55/+59
|/ | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* Merge pull request #650 from mcuadros/endpointMáximo Cuadros2017-11-2125-269/+278
|\ | | | | transport: converts Endpoint interface into a struct
| * *: add pointer to the new transport.Endpoint structMáximo Cuadros2017-11-2123-102/+83
| | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
| * transport: converts Endpoint interface into a structMáximo Cuadros2017-11-212-167/+195
| | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | Merge pull request #651 from erizocosmico/fix/remove-ref-cacheMáximo Cuadros2017-11-211-48/+29
|\ \ | |/ |/| dotgit: remove ref cache for packed refs
| * dotgit: remove ref cache for packed refsMiguel Molina2017-11-211-48/+29
|/ | | | Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
* transport: git and http, full mocked testsMáximo Cuadros2017-11-202-8/+7
| | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* transport: git and http, full mocked testsMáximo Cuadros2017-11-206-243/+211
| | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* transport: ssh, mocked SSH server, fixes #332Máximo Cuadros2017-11-202-25/+108
| | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* transport: ssh, fixes override HostKeyCallback from DefaultClientMáximo Cuadros2017-11-202-4/+2
| | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* Merge pull request #647 from ferhatelmas/typo-fixesMáximo Cuadros2017-11-2013-20/+20
|\ | | | | examples,plumbing,utils: typo fixes
| * examples,plumbing,utils: typo fixesferhat elmas2017-11-2013-20/+20
| |
* | Merge pull request #646 from mcuadros/decode-object-at-fixMáximo Cuadros2017-11-202-4/+29
|\ \ | |/ |/| format: packfile fix DecodeObjectAt when Decoder has type
| * format: packfile fix DecodeObjectAt when Decoder has typeMáximo Cuadros2017-11-192-4/+29
| | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>