aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
|\ \
| * \ Merge pull request #369 from smola/windowsMáximo Cuadros2017-06-177-31/+25
| |\ \ | | | | | | | | Windows support
| | * | dotgit: support reading reference files in WindowsSantiago M. Mola2017-06-021-9/+8
| | | |
| | * | test: more Windows path handlingSantiago M. Mola2017-06-022-3/+4
| | | |
| | * | test: use regular paths for inproc server tests (windows)Santiago M. Mola2017-06-021-13/+7
| | | |
| | * | test: fix path handling in tests for WindowsSantiago M. Mola2017-06-021-3/+3
| | | |
| | * | test: fix test for error checking in WindowsSantiago M. Mola2017-06-021-1/+2
| | | |
| | * | appveyor: fix PATH to include git-receive-pack / git-upload-packSantiago M. Mola2017-06-021-2/+1
| | | |
* | | | *: upgrade to go-billy.v3, mergeMáximo Cuadros2017-06-1831-134/+148
|/ / /
* | | Merge pull request #421 from smola/iter-namingMáximo Cuadros2017-06-145-11/+11
|\ \ \ | | | | | | | | fix naming of NewCommit{Pre,Post}Iterator
| * | | fix naming of NewCommit{Pre,Post}IteratorSantiago M. Mola2017-06-135-11/+11
| | |/ | |/| | | | | | | | | | Use Iter suffix, just as all other iterators in the project. Use Preorder and Postorder to be more clear.
* | | Merge pull request #422 from smola/gofmtMáximo Cuadros2017-06-134-5/+7
|\ \ \ | | | | | | | | fix gofmt
| * | | fix gofmtSantiago M. Mola2017-06-134-5/+7
| |/ /
* | | Merge pull request #418 from smola/ssh-issue-310Santiago M. Mola2017-06-136-39/+189
|\ \ \ | |/ / |/| | fix push on git and ssh
| * | transport/internal: remove Wait function, use Close directlySantiago M. Mola2017-06-134-32/+19
| | |
| * | fix ReceivePackSuite.TestSendPackAddDeleteReferenceSantiago M. Mola2017-06-131-2/+4
| | |
| * | plumbing/transport: detect "access denied error"Santiago M. Mola2017-06-131-5/+10
| | | | | | | | | | | | | | | | | | | | | "ERR access denied or repository not exported:" is now detected as transport.ErrRepositoryNotFound, since that's what git-daemon returns when --informative-errors is not used.
| * | transport/git: add git-receive-pack testsSantiago M. Mola2017-06-131-0/+140
| | |
| * | plumbing/transport: detect git protocol "no such repository" errorSantiago M. Mola2017-06-131-0/+5
| | |
| * | transport/git: ensure port is added to host parameterSantiago M. Mola2017-06-131-1/+6
| | |
| * | ensure receive-pack session is closed on push.Santiago M. Mola2017-06-132-1/+7
|/ / | | | | | | | | | | * at low level, ReceivePack must close its stream to the server to signal it has finished. * remote.go: Close() must be called on session.
* | Merge pull request #409 from smola/dirty-plainopenSantiago M. Mola2017-06-055-15/+37
|\ \ | |/ |/| storage/filesystem: call initialization explicitly, fixes #408
| * storage/filesystem: call initialization explicitely, fixes #408Santiago M. Mola2017-06-015-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | filesystem.Storage was initializing the gitdir (creating objects and refs) on NewStorage. But this should be done only on init and clone operations, not on open. Now there is a new interface storer.Initializer that storers can implement if they need any initialization step before init or clone. filesystem.Storage is one of such implementations. git.Init and git.Clone now call to the storer Init() method if it does implement it. Otherwise, it just ignores initialization.
* | Merge pull request #411 from src-d/fix/delta-copy-operationsSantiago M. Mola2017-06-022-1/+35
|\ \ | |/ |/| packfile: A copy operation cannot be bigger than 64kb
| * packfile: A copy operation cannot be bigger than 64kbAntonio Jesus Navarro Perez2017-06-012-1/+35
| | | | | | | | More info here: https://github.com/git/git/blob/f7466e94375b3be27f229c78873f0acf8301c0a5/diff-delta.c#L428
* | Merge pull request #405 from ekyoung/support-ssh-agent-on-windowsSantiago M. Mola2017-06-012-14/+15
|\ \ | |/ |/| Support SSH Agent Auth on Windows
| * Use xanzy/ssh-agent to create the ssh agent correctly based on os.Ethan Young2017-06-012-14/+15
|/
* Merge pull request #400 from ajnavarro/improvement/diff-deltav4.0.0-rc10Santiago M. Mola2017-05-242-441/+94
|\ | | | | format/packfile: improve binary delta algorithm
| * format/packfile: improve binary delta algorithmAntonio Jesus Navarro Perez2017-05-242-441/+94
|/ | | | Implemented algorithm described in "File System Support for Delta Compression" paper, from "Joshua P. MacDonald".
* Merge pull request #388 from ajnavarro/feature/commit-diffMáximo Cuadros2017-05-2313-1/+1614
|\ | | | | format/diff: unified diff encoder and public API