aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #573 from orirawlings/pushSidebandMáximo Cuadros2017-09-018-6/+118
|\ | | | | Add sideband support for push
| * Add sideband support for pushOri Rawlings2017-09-018-6/+118
| |
* | Merge pull request #572 from mcuadros/resetMáximo Cuadros2017-09-016-130/+277
|\ \ | |/ |/| Worktree.Reset refactor and Soft, Merge, Hard and Mixed modes
| * Worktree.Reset ignore untracked files on Merge modeMáximo Cuadros2017-09-016-130/+277
|/
* Merge pull request #569 from erizocosmico/fix/race-condition-dotgit-refsMáximo Cuadros2017-08-291-10/+15
|\ | | | | dotgit: avoid duplicated references returned by Refs
| * dotgit: avoid duplicated references returned by RefsMiguel Molina2017-08-291-10/+15
|/ | | | Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
* Merge pull request #567 from strib/avoid-revlist-when-deletingv4.0.0-rc14Máximo Cuadros2017-08-282-3/+48
|\ | | | | remote: avoid expensive revlist operation when only deleting refs
| * remote: avoid expensive revlist operation when only deleting refsJeremy Stribling2017-08-282-3/+48
| |
* | Merge pull request #565 from strib/delta-sliding-windowMáximo Cuadros2017-08-282-1/+23
|\ \ | |/ |/| plumbing: use sliding window in delta calculations, like git CL
| * plumbing: use sliding window in delta calculations, like git CLJeremy Stribling2017-08-282-1/+23
|/ | | | | | | | | | This sets a default sliding window of 10 for the delta calculation, just like git CL: https://git-scm.com/docs/git-pack-objects#git-pack-objects---windowltngt For a big-ish repo with 35K objects (17K commits), this reduced the time for calling `deltaSelection.walk` during a push from more than 14 minutes to about a minute.
* Merge pull request #554 from strib/strib/fix-win-cmd-lookupMáximo Cuadros2017-08-282-2/+2
|\ | | | | plumbing: use LookPath instead of Stat to fix Windows executables
| * plumbing: use LookPath instead of Stat to fix Windows executablesJeremy Stribling2017-08-272-2/+2
| | | | | | | | | | | | When git-core isn't in the user's PATH, we need to use `LookPath` to verify the existence of the executable, rather than `os.Stat`, so that on Windows it will search for files with executable suffixes.
* | Merge pull request #564 from strib/tree-walker-use-seen-cacheMáximo Cuadros2017-08-285-11/+43
|\ \ | |/ |/| plumbing: use `seen` map in tree walker
| * plumbing: use `seen` map in tree walkerJeremy Stribling2017-08-275-11/+43
|/ | | | | | | This helps avoids iterating down the same trees for every commit. For a big-ish repo with 35K objects (17K commits), this reduced the time for calling `revlist.Objects` during a push (with 0 hashes to ignore) from more than ten minutes to less than a minute.
* Merge pull request #558 from orirawlings/cloneAnnotatedTagMáximo Cuadros2017-08-272-12/+62
|\ | | | | repository: Resolve commit when cloning annotated tag, fixes #557
| * repository: Resolve commit when cloning annotated tag, fixes #557Ori Rawlings2017-08-242-12/+62
| |
* | Merge pull request #563 from erizocosmico/perf/dotgit-ref-cacheMáximo Cuadros2017-08-272-24/+76
|\ \ | |/ |/| dotgit: rewrite the way references are looked up
| * dotgit: rewrite the way references are looked upMiguel Molina2017-08-262-24/+76
| | | | | | | | | | | | Now there's only two ways of getting a reference, by checking under refs/ directory or in packed-refs. refs/ directory is checked using a direct read by reference name and packed refs are cached until they have been changed. Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
* | grammar correctionZach Gershman2017-08-241-1/+1
|/ | | *stopped instead of stop
* Merge pull request #555 from mcuadros/ctx-exampleMáximo Cuadros2017-08-223-0/+48
|\ | | | | _examples: context
| * _examples: contextMáximo Cuadros2017-08-223-0/+48
|/
* Merge pull request #552 from mcarmonaa/fix/packp-adv-refs-encodeMáximo Cuadros2017-08-192-38/+56
|\ | | | | packp: fixed encoding when HEAD is not a valid ref
| * packp: fixed encoding when HEAD is not a valid refManuel Carmona2017-08-182-38/+56
|/
* Merge pull request #546 from orirawlings/pullExampleMáximo Cuadros2017-08-143-1/+61
|\ | | | | examples: add example for pulling changes
| * Add example for pulling changesOri Rawlings2017-08-133-1/+61
|/
* Merge pull request #544 from erizocosmico/fix/race-condition-object-lruMáximo Cuadros2017-08-122-0/+39
|\ | | | | fix race condition on ObjectLRU
| * fix race condition on ObjectLRUMiguel Molina2017-08-112-0/+39
|/ | | | Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
* Merge pull request #543 from erizocosmico/fix/packwriter-unused-notifyMáximo Cuadros2017-08-102-1/+22
|\ | | | | prevent PackWriter from using Notify if nothing was written
| * prevent PackWriter from using Notify if nothing was writtenMiguel Molina2017-08-102-1/+22
|/ | | | Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
* README.md: added appveyorMáximo Cuadros2017-08-101-1/+1
|
* Merge pull request #540 from mcarmonaa/fix/git-transport-windows-testMáximo Cuadros2017-08-101-0/+6
|\ | | | | *: windows support, skipped receive_pack_test for git transport
| * skipped receive_pack_test for git transport in windowsManuel Carmona2017-08-101-0/+6
| |
* | Merge pull request #538 from kimh/user-current-crosscompile-errorMáximo Cuadros2017-08-101-6/+20
|\ \ | | | | | | Avoid using user.Current()
| * | Avoid using user.Current()Kim, Hirokuni2017-08-081-6/+20
| |/ | | | | | | | | user.Current() causes 'Current not implemented' error when crosscompiled. See https://github.com/golang/go/issues/6376
* | Merge pull request #542 from mcarmonaa/fix/config-marhalMáximo Cuadros2017-08-102-4/+12
|\ \ | |/ |/| serialized remotes in alphabetical order
| * serialized remotes in alphabetical orderManuel Carmona2017-08-102-4/+12
|/
* *: windows support, some more fixes (2) (#536)Manuel Carmona2017-08-075-1/+33
| | | | | | | | | | | | | | * fixed windows failed test: "143 FAIL: worktree_test.go:314: WorktreeSuite.TestFilenameNormalization" * fixed windows failed test: "489: FAIL: auth_method_test.go:106: SuiteCommon.TestNewSSHAgentAuthNoAgent" * fixed windows failed test: "279 FAIL: server_test.go:50: ServerSuite.TestClone" fixed windows failed test: "298 FAIL: server_test.go:37: ServerSuite.TestPush" * fixed windows failed test: "316 FAIL: <autogenerated>:26: UploadPackSuite.TearDownSuite" * fixed windows failed test: "FAIL: <autogenerated>:6: IndexSuite.TearDownSuite"
* Merge pull request #527 from strib/win-pack-cmdsMáximo Cuadros2017-08-042-2/+75
|\ | | | | plumbing: fix pack commands for the file client on Windows
| * plumbing: fix pack commands for the file client on WindowsJeremy Stribling2017-08-032-2/+75
| | | | | | | | | | | | The default git install on Windows doesn't come with commands for receive-pack and upload-pack in the default $PATH. Instead, use --exec-path to find pack executables in that case.
* | *: windows support, some more fixes (#533)Manuel Carmona2017-08-035-7/+15
| | | | | | | | | | | | | | | | | | | | * fixed windows failed test: "134 FAIL: repository_test.go:340: RepositorySuite.TestPlainOpenBareRelativeGitDirFileTrailingGarbage" * fixed windows failed test: "143 FAIL: worktree_test.go:367: WorktreeSuite.TestCheckoutIndexOS" * fixed windows failed test: "296 FAIL: receive_pack_test.go:36: ReceivePackSuite.TearDownTest" * fixed windows failed test: "152 FAIL: worktree_test.go:278: WorktreeSuite.TestCheckoutSymlink"
* | Merge pull request #526 from joshbetz/fix/filename-formMáximo Cuadros2017-08-023-2/+61
|\ \ | | | | | | Normalize filenames before comparing.
| * | worktree: normalized string comparison testsMáximo Cuadros2017-08-022-1/+54
| | |
| * | Normalize filenames before comparing.Josh Betz2017-07-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some multibyte characters can have multiple representations. Before comparing strings, we need to normalize them. In this case we're normalizing to normalized form C, but it shouldn't matter as long as both strings are normalized to the same form. Fixes https://github.com/src-d/go-git/issues/495
* | | Merge pull request #532 from mcuadros/fix-shalloMáximo Cuadros2017-08-022-15/+44
|\ \ \ | | | | | | | | Remote.Clone fix clone of tags in shallow mode
| * | | Remote.Clone fix clone of tags in shallow modeMáximo Cuadros2017-08-022-15/+44
|/ / /
* | | Merge pull request #531 from mcuadros/ref-nameMáximo Cuadros2017-08-027-39/+37
|\ \ \ | | | | | | | | plumbing: moved `Reference.Is*` methods to `ReferenceName.Is*`
| * | | *: use the new API for ReferenceName.Is* methodsMáximo Cuadros2017-08-025-15/+13
| | | |
| * | | plumbing: moved `Reference.Is*` methods to `ReferenceName.Is*`Máximo Cuadros2017-08-022-24/+24
| | | |
* | | | Merge pull request #501 from smola/config-multiple-urlsMáximo Cuadros2017-08-0217-81/+219
|\ \ \ \ | |_|/ / |/| | | config: multiple values in RemoteConfig (URLs and Fetch)
| * | | config: preserve option order on config marshallingSantiago M. Mola2017-08-017-24/+99
| | | | | | | | | | | | | | | | | | | | Do not change order of options (e.g. in RemoteConfig) when serializing for any option whose value has not changed.