aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #477 from taralx/patch-2Máximo Cuadros2017-07-131-5/+0
|\ | | | | git: remove ErrObjectNotFound in favor of plumbing.ErrObjectNotFound
| * git: remove ErrObjectNotFound in favor of plumbing.ErrObjectNotFoundJP Sugarbroad2017-07-121-5/+0
|/
* Merge pull request #475 from mcuadros/fix-ackMáximo Cuadros2017-07-122-23/+42
|\ | | | | plumbing: protocol, fix handling multiple ACK on upload-pack and test…
| * plumbing: protocol, fix handling multiple ACK on upload-packMáximo Cuadros2017-07-122-23/+42
| |
* | Merge pull request #476 from smola/server-as-clientMáximo Cuadros2017-07-113-7/+49
|\ \ | | | | | | transport/server: add asClient parameter
| * | transport/server: add NewClientSantiago M. Mola2017-07-113-7/+49
| |/ | | | | | | | | | | server.NewClient returns a server that acts as a client. This makes it working seamlessly when registering a server directly with `client.InstallProtocol`.
* | Merge pull request #472 from smola/fix-caps-delete-refsMáximo Cuadros2017-07-115-41/+35
|\ \ | |/ |/| improve delete support on push
| * improve delete support on pushSantiago M. Mola2017-07-115-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * server: implement delete-refs and announce it. * remote: check if server announced delete-refs before trying to delete and fail fast if it does not. Note that the client does not need no send 'delete-refs' back to the server to be able to delete references: ``` delete-refs ----------- If the server sends back the 'delete-refs' capability, it means that it is capable of accepting a zero-id value as the target value of a reference update. It is not sent back by the client, it simply informs the client that it can be sent zero-id values to delete references. ``` So our server implementation does not check if the client sent delete-refs back, it just accepts deletes if it receives them.
* | Merge pull request #469 from mcuadros/fix-multiple-ackMáximo Cuadros2017-07-114-17/+76
|\ \ | |/ |/| plumbing: protocol, fix handling multiple ACK on upload-pack
| * plumbing: protocol, fix handling multiple ACK on upload-packMáximo Cuadros2017-07-084-17/+76
| |
* | Merge pull request #464 from smola/race-463Máximo Cuadros2017-07-072-21/+31
|\ \ | | | | | | transport/file: avoid race with Command.Wait, fixes #463
| * | transport/file: avoid race with Command.Wait, fixes #463Santiago M. Mola2017-07-071-4/+14
| | | | | | | | | | | | | | | | | | Pipe returned by Command.StderrPipe() has a race with Read and Command.Wait(). We use a io.Pipe() instead and ensure it is closed after Wait().
| * | transport/internal: read only first error lineSantiago M. Mola2017-07-071-17/+17
| |/ | | | | | | | | | | | | We only use the first line of error output. So we use a channel with a single byte buffer and read the first line from stderr. Further output is discarded, as well as any further I/O error, which might be expected when closing the pipe (command finished).
* | Merge pull request #465 from smola/fix-short-refMáximo Cuadros2017-07-072-18/+23
|\ \ | | | | | | fix reference shortening
| * | fix reference shorteningSantiago M. Mola2017-07-072-18/+23
| |/ | | | | | | | | Implemented according to git shorten_unambiguous_ref. See: https://github.com/git/git/blob/e0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7/refs.c#L1030
* | Merge pull request #467 from smola/push-deleteMáximo Cuadros2017-07-072-12/+95
|\ \ | |/ |/| remote: fix push delete, closes #466
| * remote: fix push delete, closes #466Santiago M. Mola2017-07-072-12/+95
|/ | | | | Refspecs for deletes were not being used to produce delete commands on the update request.
* Merge pull request #423 from smola/ssh-optionsMáximo Cuadros2017-07-051-3/+36
|\ | | | | transport/ssh: allow passing SSH options
| * transport/ssh: allow global *ssh.ClientConfig overrideSantiago M. Mola2017-06-231-14/+31
| | | | | | | | | | A global *ssh.ClientConfig override can be set. It will be use to override values of each SSH session.
| * transport/ssh: allow passing SSH optionsSantiago M. Mola2017-06-231-3/+19
| | | | | | | | | | Adds the possibility of passing options to SSH transport. Options have the form of functions modifying ssh.ClientConfig.
* | Merge pull request #432 from ajnavarro/feature/http-pushMáximo Cuadros2017-07-054-77/+266
|\ \ | | | | | | transport: http push
| * | fix auth error issueAntonio Jesus Navarro Perez2017-07-042-1/+7
| | |
| * | fix CGI git serverAntonio Jesus Navarro Perez2017-07-041-7/+14
| | |
| * | transport: http pushAntonio Jesus Navarro Perez2017-07-044-77/+253
|/ /
* | Merge pull request #453 from smola/raceMáximo Cuadros2017-06-271-1/+1
|\ \ | | | | | | fix race on packfile writer, fixes #351
| * | fix race on packfile writerSantiago M. Mola2017-06-271-1/+1
|/ /
* | Merge pull request #451 from smola/hotfix-unknown-capabilitiesMáximo Cuadros2017-06-242-10/+6
|\ \ | | | | | | capability: accept unknown capabilities, fixes #450
| * | capability: accept unknown capabilities, fixes #450Santiago M. Mola2017-06-232-10/+6
| |/ | | | | | | | | | | | | | | | | GitHub has started using a non-standard capability "early-capabilities" with agent=git/github-g3daa19f21. This is breaking all go-git operations on GitHub. This commit removes validation for known capabilities, so that we can use non-standard capabilities safely.
* | Merge pull request #452 from taralx/patch-1Máximo Cuadros2017-06-241-1/+1
|\ \ | |/ |/| storage/filesystem: Fix nil dereference in Shallow()
| * storage/filesystem: Fix nil dereference in Shallow()JP Sugarbroad2017-06-231-1/+1
|/ | | This code crashes if the shallow file doesn't exist.
* Merge pull request #444 from silvertern/gitignore-ch2v4.0.0-rc11Máximo Cuadros2017-06-212-7/+35
|\ | | | | Fixes checkout not possible with (untracked) files under gitignore
| * Adds test that checkout possible with untracked files under gitignoreOleg Sklyar2017-06-211-4/+30
| |
| * Fixes gitignore ignored on checkoutOleg Sklyar2017-06-201-3/+5
| |
* | Merge pull request #434 from ↵Máximo Cuadros2017-06-212-25/+69
|\ \ | |/ |/| | | | | orirawlings/updateLocalRemoteRefsEvenIfNoPackFetched Update local remote references during fetch even if no pack needs to be received
| * Update local remote references during fetch even if no pack needs to be receivedOri Rawlings2017-06-192-25/+69
|/
* Merge pull request #442 from ajnavarro/fix/stackoverflowMáximo Cuadros2017-06-191-6/+6
|\ | | | | internal/dotgit: rewrite code to avoid stackoverflow errors
| * internal/dotgit: rewrite code to avoid stackoverflow errorsAntonio Jesus Navarro Perez2017-06-191-6/+6
| |
* | Merge pull request #441 from mcuadros/fix-addMáximo Cuadros2017-06-193-115/+56
|\ \ | | | | | | worktree: Add create and push the blob objects to the storer
| * | worktree: Add create and push the blob objects to the storerMáximo Cuadros2017-06-193-115/+56
| |/ | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | Merge pull request #440 from ajnavarro/fix/revlist-submodulesMáximo Cuadros2017-06-192-1/+24
|\ \ | |/ |/| revlist: ignore treeEntries that are submodules.
| * revlist: ignore treeEntries that are submodules.Antonio Jesus Navarro Perez2017-06-192-1/+24
|/ | | | - If we don't ignore submodules in trees, when we tried to perform a push, revlist.Objects returned hashes that was from submodules, causing an "object not found" error in packfile generation.
* worktree: fix ioutil import pathMáximo Cuadros2017-06-191-1/+1
|
* Merge pull request #436 from mcuadros/symlinkMáximo Cuadros2017-06-196-27/+198
|\ | | | | worktree: symlink support
| * worktree: support for symlinksMáximo Cuadros2017-06-194-21/+144
| |
| * utils: merkletrie support for symlinksMáximo Cuadros2017-06-182-6/+54
| |
* | plumbing: gitignore, upgrade to go-billy.v3 and test with gocheckMáximo Cuadros2017-06-195-219/+200
| |
* | Merge pull request #429 from silvertern/gitignoreMáximo Cuadros2017-06-199-0/+758
|\ \ | |/ |/| Adds .gitignore support
| * Adds gitignore supportOleg Sklyar2017-06-199-0/+758
| |
* | fix merge commitMáximo Cuadros2017-06-181-4/+0
| |
* | *: upgrade to go-billy.v3, mergeMáximo Cuadros2017-06-181-0/+4
|\ \
generated by cgit (git 2.34.1) at 2024-11-14 20:31:22 +0000