Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #475 from mcuadros/fix-ack | Máximo Cuadros | 2017-07-12 | 2 | -23/+42 |
|\ | | | | | plumbing: protocol, fix handling multiple ACK on upload-pack and test… | ||||
| * | plumbing: protocol, fix handling multiple ACK on upload-pack | Máximo Cuadros | 2017-07-12 | 2 | -23/+42 |
| | | |||||
* | | Merge pull request #476 from smola/server-as-client | Máximo Cuadros | 2017-07-11 | 3 | -7/+49 |
|\ \ | | | | | | | transport/server: add asClient parameter | ||||
| * | | transport/server: add NewClient | Santiago M. Mola | 2017-07-11 | 3 | -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-refs | Máximo Cuadros | 2017-07-11 | 5 | -41/+35 |
|\ \ | |/ |/| | improve delete support on push | ||||
| * | improve delete support on push | Santiago M. Mola | 2017-07-11 | 5 | -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-ack | Máximo Cuadros | 2017-07-11 | 4 | -17/+76 |
|\ \ | |/ |/| | plumbing: protocol, fix handling multiple ACK on upload-pack | ||||
| * | plumbing: protocol, fix handling multiple ACK on upload-pack | Máximo Cuadros | 2017-07-08 | 4 | -17/+76 |
| | | |||||
* | | Merge pull request #464 from smola/race-463 | Máximo Cuadros | 2017-07-07 | 2 | -21/+31 |
|\ \ | | | | | | | transport/file: avoid race with Command.Wait, fixes #463 | ||||
| * | | transport/file: avoid race with Command.Wait, fixes #463 | Santiago M. Mola | 2017-07-07 | 1 | -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 line | Santiago M. Mola | 2017-07-07 | 1 | -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-ref | Máximo Cuadros | 2017-07-07 | 2 | -18/+23 |
|\ \ | | | | | | | fix reference shortening | ||||
| * | | fix reference shortening | Santiago M. Mola | 2017-07-07 | 2 | -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-delete | Máximo Cuadros | 2017-07-07 | 2 | -12/+95 |
|\ \ | |/ |/| | remote: fix push delete, closes #466 | ||||
| * | remote: fix push delete, closes #466 | Santiago M. Mola | 2017-07-07 | 2 | -12/+95 |
|/ | | | | | Refspecs for deletes were not being used to produce delete commands on the update request. | ||||
* | Merge pull request #423 from smola/ssh-options | Máximo Cuadros | 2017-07-05 | 1 | -3/+36 |
|\ | | | | | transport/ssh: allow passing SSH options | ||||
| * | transport/ssh: allow global *ssh.ClientConfig override | Santiago M. Mola | 2017-06-23 | 1 | -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 options | Santiago M. Mola | 2017-06-23 | 1 | -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-push | Máximo Cuadros | 2017-07-05 | 4 | -77/+266 |
|\ \ | | | | | | | transport: http push | ||||
| * | | fix auth error issue | Antonio Jesus Navarro Perez | 2017-07-04 | 2 | -1/+7 |
| | | | |||||
| * | | fix CGI git server | Antonio Jesus Navarro Perez | 2017-07-04 | 1 | -7/+14 |
| | | | |||||
| * | | transport: http push | Antonio Jesus Navarro Perez | 2017-07-04 | 4 | -77/+253 |
|/ / | |||||
* | | Merge pull request #453 from smola/race | Máximo Cuadros | 2017-06-27 | 1 | -1/+1 |
|\ \ | | | | | | | fix race on packfile writer, fixes #351 | ||||
| * | | fix race on packfile writer | Santiago M. Mola | 2017-06-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #451 from smola/hotfix-unknown-capabilities | Máximo Cuadros | 2017-06-24 | 2 | -10/+6 |
|\ \ | | | | | | | capability: accept unknown capabilities, fixes #450 | ||||
| * | | capability: accept unknown capabilities, fixes #450 | Santiago M. Mola | 2017-06-23 | 2 | -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-1 | Máximo Cuadros | 2017-06-24 | 1 | -1/+1 |
|\ \ | |/ |/| | storage/filesystem: Fix nil dereference in Shallow() | ||||
| * | storage/filesystem: Fix nil dereference in Shallow() | JP Sugarbroad | 2017-06-23 | 1 | -1/+1 |
|/ | | | This code crashes if the shallow file doesn't exist. | ||||
* | Merge pull request #444 from silvertern/gitignore-ch2v4.0.0-rc11 | Máximo Cuadros | 2017-06-21 | 2 | -7/+35 |
|\ | | | | | Fixes checkout not possible with (untracked) files under gitignore | ||||
| * | Adds test that checkout possible with untracked files under gitignore | Oleg Sklyar | 2017-06-21 | 1 | -4/+30 |
| | | |||||
| * | Fixes gitignore ignored on checkout | Oleg Sklyar | 2017-06-20 | 1 | -3/+5 |
| | | |||||
* | | Merge pull request #434 from ↵ | Máximo Cuadros | 2017-06-21 | 2 | -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 received | Ori Rawlings | 2017-06-19 | 2 | -25/+69 |
|/ | |||||
* | Merge pull request #442 from ajnavarro/fix/stackoverflow | Máximo Cuadros | 2017-06-19 | 1 | -6/+6 |
|\ | | | | | internal/dotgit: rewrite code to avoid stackoverflow errors | ||||
| * | internal/dotgit: rewrite code to avoid stackoverflow errors | Antonio Jesus Navarro Perez | 2017-06-19 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #441 from mcuadros/fix-add | Máximo Cuadros | 2017-06-19 | 3 | -115/+56 |
|\ \ | | | | | | | worktree: Add create and push the blob objects to the storer | ||||
| * | | worktree: Add create and push the blob objects to the storer | Máximo Cuadros | 2017-06-19 | 3 | -115/+56 |
| |/ | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com> | ||||
* | | Merge pull request #440 from ajnavarro/fix/revlist-submodules | Máximo Cuadros | 2017-06-19 | 2 | -1/+24 |
|\ \ | |/ |/| | revlist: ignore treeEntries that are submodules. | ||||
| * | revlist: ignore treeEntries that are submodules. | Antonio Jesus Navarro Perez | 2017-06-19 | 2 | -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 path | Máximo Cuadros | 2017-06-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #436 from mcuadros/symlink | Máximo Cuadros | 2017-06-19 | 6 | -27/+198 |
|\ | | | | | worktree: symlink support | ||||
| * | worktree: support for symlinks | Máximo Cuadros | 2017-06-19 | 4 | -21/+144 |
| | | |||||
| * | utils: merkletrie support for symlinks | Máximo Cuadros | 2017-06-18 | 2 | -6/+54 |
| | | |||||
* | | plumbing: gitignore, upgrade to go-billy.v3 and test with gocheck | Máximo Cuadros | 2017-06-19 | 5 | -219/+200 |
| | | |||||
* | | Merge pull request #429 from silvertern/gitignore | Máximo Cuadros | 2017-06-19 | 9 | -0/+758 |
|\ \ | |/ |/| | Adds .gitignore support | ||||
| * | Adds gitignore support | Oleg Sklyar | 2017-06-19 | 9 | -0/+758 |
| | | |||||
* | | fix merge commit | Máximo Cuadros | 2017-06-18 | 1 | -4/+0 |
| | | |||||
* | | *: upgrade to go-billy.v3, merge | Máximo Cuadros | 2017-06-18 | 1 | -0/+4 |
|\ \ | |||||
| * \ | Merge pull request #369 from smola/windows | Máximo Cuadros | 2017-06-17 | 7 | -31/+25 |
| |\ \ | | | | | | | | | Windows support | ||||
| | * | | dotgit: support reading reference files in Windows | Santiago M. Mola | 2017-06-02 | 1 | -9/+8 |
| | | | |