aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #493 from src-d/windowsMáximo Cuadros2017-07-1913-51/+95
|\ | | | | *: several windows support fixes
| * plumbing: transport server, remove letfoverMáximo Cuadros2017-07-191-3/+0
| |
| * storage: dotgit, fix test not closing filesMáximo Cuadros2017-07-192-0/+2
| |
| * utils: merkletrie filesystem based on path, and not in filepathMáximo Cuadros2017-07-193-14/+14
| |
| * plumbing: format config, escape back slashMáximo Cuadros2017-07-192-4/+2
| |
| * worktree: commit, use path package instead of filepathMáximo Cuadros2017-07-192-2/+10
| |
| * worktree: commit, use path package instead of filepathMáximo Cuadros2017-07-191-13/+13
| |
| * worktree: submodules, missing err validation on load configMáximo Cuadros2017-07-191-0/+4
| |
| * worktree: close .gitmodule filesMáximo Cuadros2017-07-191-0/+1
| |
| * worktree: fix file system info in windowsMáximo Cuadros2017-07-192-1/+20
| |
| * plumbing: transport git fix test on windowsMáximo Cuadros2017-07-181-1/+3
| |
| * plumbing: server, fix loader in windowsMáximo Cuadros2017-07-181-1/+4
| |
| * storage: dotgit, close temp file before renameMáximo Cuadros2017-07-181-6/+9
| |
| * utils: merkletrie fix test on windowsMáximo Cuadros2017-07-182-16/+23
| |
* | Merge pull request #492 from ajnavarro/fix/panic-in-invalid-deltaMáximo Cuadros2017-07-192-16/+85
|\ \ | | | | | | packfile: Avoid panics patching corrupted deltas.
| * | packfile: Avoid panics patching corrupted deltasAntonio Jesus Navarro Perez2017-07-192-16/+85
| | |
* | | Merge pull request #489 from mcuadros/shallow-pushMáximo Cuadros2017-07-196-41/+166
|\ \ \ | |/ / |/| | repository: allow push from shallow repositories
| * | repository: allow push from shallow repositoriesMáximo Cuadros2017-07-195-47/+83
| | |
| * | plumbing: object, allow ignore commits in commit walkersMáximo Cuadros2017-07-182-16/+105
| |/
* | Merge pull request #487 from mcuadros/checkout-createMáximo Cuadros2017-07-193-23/+116
|\ \ | |/ |/| worktree: checkout, create branch
| * worktree: checkout, create branchMáximo Cuadros2017-07-183-23/+116
| |
* | Merge pull request #484 from orirawlings/tagsExampleMáximo Cuadros2017-07-173-1/+46
|\ \ | |/ |/| Add example code for listing tags
| * Add example code for listing tagsOri Rawlings2017-07-173-1/+46
|/
* Merge pull request #485 from mcuadros/fetch-tagsv4.0.0-rc12Máximo Cuadros2017-07-173-109/+205
|\ | | | | remote: fetch, correct behavior on tags
| * remote: fetch, correct behaviour on tagsMáximo Cuadros2017-07-173-109/+205
| |
* | Merge pull request #480 from mcuadros/empty-statusMáximo Cuadros2017-07-164-16/+51
|\ \ | | | | | | remote: fix Worktree.Status on empty repository
| * | remote: fix Worktree.Status on empty repositoryMáximo Cuadros2017-07-134-16/+51
| |/
* | Merge pull request #479 from mcuadros/duplicateMáximo Cuadros2017-07-162-3/+32
|\ \ | |/ |/| remote: avoid duplicate haves
| * remote: avoid duplicate havesMáximo Cuadros2017-07-132-3/+32
|/
* Merge pull request #414 from Cromel/modules_dirMáximo Cuadros2017-07-132-2/+2
|\ | | | | Fixed modules directory path
| * Fixed modules directory pathCromel-PC\Cromel2017-06-282-2/+2
| |
* | Merge pull request #478 from mcuadros/test-worktreeMáximo Cuadros2017-07-132-36/+61
|\ \ | | | | | | worktree: test improvemnts on empty worktree
| * | worktree: test improvemnts on empty worktreeMáximo Cuadros2017-07-132-36/+61
|/ /
* | Merge pull request #473 from taralx/patch-1Máximo Cuadros2017-07-131-2/+3
|\ \ | | | | | | Use buffered IO for decoding index files.
| * | Use buffered IO for decoding index files.JP Sugarbroad2017-07-101-2/+3
| | | | | | | | | | | | This reduces syscall CPU time from >40% to <10% in my local repository.
* | | 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