aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #1203 from sapk-fork/fix-int64v4.13.1Máximo Cuadros2019-08-011-1/+1
|\ \ \ \ | |/ / / |/| | | worktree: force convert to int64 to support 32bit os. Fix #1202
| * | | worktree: force convert to int64 to support 32bit os. Fix #1202Antoine GIRARD2019-08-011-1/+1
|/ / / | | | | | | | | | Signed-off-by: Antoine GIRARD <sapk@sapk.fr>
* | | Merge pull request #1200 from src-d/go-modv4.13.0Máximo Cuadros2019-07-292-10/+30
|\ \ \ | | | | | | | | *: go module update
| * | | *: go module updateMáximo Cuadros2019-07-292-10/+30
|/ / / | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #1199 from src-d/clean-upMáximo Cuadros2019-07-2928-49/+40
|\ \ \ | | | | | | | | *: code quality improvements
| * | | plumbing/object: don't assign err from ForEach loopChristian Muehlhaeuser2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't check the value anyway, as it can't possibly be anything but nil. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 293e70fbceb5c81f33a96d5705f10785c6063db9)
| * | | *: avoid unnecessary conversionsChristian Muehlhaeuser2019-07-2914-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to convert these values, they're already of the right type. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit a1d8a7ac8bd0e4aff0f27dbb8bb37b8bd13a1346)
| * | | plumbing/format: simplify codeChristian Muehlhaeuser2019-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a bit easier to read, in my opinion. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 91d314ce8f13eff06fd4af8b869cee5a3e2ab014)
| * | | plumbing/format: idxfile, unsigned values are never < 0Christian Muehlhaeuser2019-07-291-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 047bb4f6d0657389ddd4ca3230ff3bee08d66a6b)
| * | | *: added missing error checks in testsChristian Muehlhaeuser2019-07-297-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we assign a value to err, make sure to also check for it being nil afterwards. If those were intentionally unchecked, we should remove the assignment in the first place. Those checks certainly never harm, but please review thoroughly and let me know. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 19d6f42a4d814a50bd262fbb69a9b670db9756a2)
| * | | *: fixed tautological error conditionsautological error conditionsChristian Muehlhaeuser2019-07-293-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing error handling around encodeCommitData and prevented shadowing err. - Removed tautological error checks. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 7d76176416551fc21d98bc17768d158a82281406)
| * | | plumbing/object: simplify codeChristian Muehlhaeuser2019-07-291-8/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | - Use append instead of ranged for loop - Simpler bool comparison Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 3918d0e1b73f5e59a8c93e2b5ae99295cef26cf9)
* | | Merge pull request #1197 from hypnoce/masterMáximo Cuadros2019-07-292-5/+5
|\ \ \ | |/ / |/| | Make http.AuthMethod setAuth public. Fixes #1196
| * | Make http.AuthMethod setAuth public. Fixes #1196JACQUES Francois2019-07-282-5/+5
|/ / | | | | | | Signed-off-by: JACQUES Francois <Francois.JACQUES@murex.com>
* | Merge pull request #1165 from seletskiy/push-pruneMáximo Cuadros2019-07-265-16/+129
|\ \ | | | | | | Remote: add Prune option to PushOptions
| * | send PACK only if non-delete command presentStanislav Seletskiy2019-07-251-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to: https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt > The packfile MUST NOT be sent if the only command used is 'delete'. Signed-off-by: Stanislav Seletskiy <s.seletskiy@gmail.com>
| * | add Prune option to PushOptionsStanislav Seletskiy2019-07-255-6/+103
| | | | | | | | | | | | Signed-off-by: Stanislav Seletskiy <s.seletskiy@gmail.com>
* | | Merge pull request #1181 from muesli/typo-fixesMáximo Cuadros2019-07-262-3/+3
|\ \ \ | | | | | | | | Fix typos in comments
| * | | Fix typos in commentsChristian Muehlhaeuser2019-07-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Just a few simple, nit-picky typo fixes. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com>
* | | | Worktree: improve build index performance. (#1179)Nao YONASHIRO2019-07-253-18/+83
|/ / /
* | | Merge pull request #1175 from VladMasarik/vlad-typo-fixMáximo Cuadros2019-07-051-1/+1
|\ \ \ | | | | | | | | config: added missing dot.
| * | | config: added missing dot.Vladimir Masarik2019-07-041-1/+1
|/ / / | | | | | | | | | Signed-off-by: Vladimir Masarik <masarik.vladimir7@gmail.com>
* | | Merge pull request #1142 from EmrysMyrddin/feature/export-new-remotev4.12.0Máximo Cuadros2019-06-184-37/+82
|\ \ \ | | | | | | | | git : allows to create a Remote without a Repository
| * | | git : allows to create a Remote without a RepositoryValentin Cocaud2019-06-174-37/+82
|/ / / | | | | | | | | | Signed-off-by: Valentin Cocaud <v.cocaud@gmail.com>
* | | Merge pull request #1160 from novas0x2a/fix-refspecMáximo Cuadros2019-06-172-11/+62
|\ \ \ | | | | | | | | fix wildcard handling in RefSpec matching
| * | | fix wildcard handling in RefSpec matchingMike Lundy2019-06-042-11/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) The guard logic here was inverted, resulting in an always-false branch, which meant that the suffix after the wildcard was incorrectly ignored. 2) Wildcards were treated as 1-or-more matches, but git treats them as 0-or-more. This change aligns go-git with git, but represents a bit of a breaking change for go-git. Signed-off-by: Mike Lundy <mike@fluffypenguin.org>
* | | | Merge pull request #1096 from dpordomingo/merge-base-commandMáximo Cuadros2019-06-145-7/+256
|\ \ \ \ | | | | | | | | | | Add merge base command
| * | | | Add merge-base to compatibility tableDavid Pordomingo2019-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>
| * | | | Add merge-base commandDavid Pordomingo2019-06-034-6/+255
| |/ / / | | | | | | | | | | | | Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>
* | | | Merge pull request #1164 from noonehereplzgo/patch-1Máximo Cuadros2019-06-121-1/+1
|\ \ \ \ | |_|/ / |/| | | use constant instead of literal string
| * | | use constant instead of literal stringnoonehereplzgo2019-06-111-1/+1
|/ / / | | | | | | | | | Signed-off-by: Mohammad Kefah <mo@edraj.io>
* | | Merge pull request #1159 from ebardsley/poolMáximo Cuadros2019-06-062-11/+10
|\ \ \ | |/ / |/| | plumbing: format/packfile, Fix data race and resource leak.
| * | plumbing: format/packfile, Fix data race and resource leak.Ed Bardsley2019-06-032-11/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems are fixed: - Buffers are not returned to the pool in the case of errors. - Per https://golang.org/pkg/bytes/#Buffer.Bytes, the slice returned from bytes.Buffer.Bytes() is only valid until the next modification of the buffer, so it must be copied before the buffer is returned to the pool. Running `go test -race` detected the following: ``` ================== WARNING: DATA RACE Write at 0x00c000224020 by goroutine 15: bytes.(*Buffer).WriteByte() /usr/local/Cellar/go/1.11.5/libexec/src/bytes/buffer.go:271 +0xc8 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.diffDelta() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/diff_delta.go:95 +0x505 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.getDelta() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/diff_delta.go:60 +0x4ae vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).tryToDeltify() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:309 +0x398 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).walk() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:262 +0x33b vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).ObjectsToPack.func1() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:70 +0x6a Previous read at 0x00c000224020 by goroutine 8: runtime.slicecopy() /usr/local/Cellar/go/1.11.5/libexec/src/runtime/slice.go:221 +0x0 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.getDelta() vendor/gopkg.in/src-d/go-git.v4/plumbing/memory.go:53 +0x5e2 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).tryToDeltify() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:309 +0x398 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).walk() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:262 +0x33b vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).ObjectsToPack.func1() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:70 +0x6a Goroutine 15 (running) created at: vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).ObjectsToPack() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:69 +0x761 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*Encoder).Encode() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/encoder.go:52 +0xb1 vendor/gopkg.in/src-d/go-git%2ev4.pushHashes.func1() vendor/gopkg.in/src-d/go-git.v4/remote.go:1026 +0x102 Goroutine 8 (finished) created at: vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*deltaSelector).ObjectsToPack() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/delta_selector.go:69 +0x761 vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile.(*Encoder).Encode() vendor/gopkg.in/src-d/go-git.v4/plumbing/format/packfile/encoder.go:52 +0xb1 vendor/gopkg.in/src-d/go-git%2ev4.pushHashes.func1() vendor/gopkg.in/src-d/go-git.v4/remote.go:1026 +0x102 ================== ``` Signed-off-by: Ed Bardsley <ewb@uber.com>
* | Merge pull request #1097 from dpordomingo/merge-base-coreMáximo Cuadros2019-06-034-0/+971
|\ \ | | | | | | Create merge-base feature
| * | Create merge-base featureDavid Pordomingo2019-06-034-0/+971
| | | | | | | | | | | | Signed-off-by: David Pordomingo <David.Pordomingo.F@gmail.com>
* | | Merge pull request #1154 from yelirekim/rebase_configMáximo Cuadros2019-05-203-2/+26
|\ \ \ | | | | | | | | Support the 'rebase' config key for branches
| * | | Support the 'rebase' config key for branchesMike Riley2019-05-173-2/+26
| | | | | | | | | | | | | | | | Signed-off-by: Mike Riley <mikeriley@yelirekim.com>
* | | | Merge pull request #1145 from linuxerwang/masterMáximo Cuadros2019-05-163-0/+47
|\ \ \ \ | |_|_|/ |/| | | Worktree: keep local changes when checkout branch
| * | | Keep local changes when checkout branch in worktree.Linuxer Wang2019-05-153-0/+47
|/ / / | | | | | | | | | Signed-off-by: Linuxer Wang <linuxerwang@gmail.com>
* | | Merge pull request #1146 from novas0x2a/fix-tag-oidMáximo Cuadros2019-05-162-49/+42
|\ \ \ | |/ / |/| | improve ResolveRevision's Ref lookup path
| * | improve ResolveRevision's Ref lookup pathMike Lundy2019-05-142-49/+42
|/ / | | | | | | | | | | | | | | | | | | 1) lookups on an annotated tag oid now work 2) there was a lot of complexity around detection of ambiguity, but unlike git, ambiguous refs are rejected (which causes bugs like #823). The new code matches rev-parse's behavior (prefer the OID), though there is no warning path to report the same warning. Signed-off-by: Mike Lundy <mike@fluffypenguin.org>
* | Merge pull request #1132 from filipnavara/commitgraph-objMáximo Cuadros2019-05-1412-6/+961
|\ \ | | | | | | plumbing: object, add APIs for traversing over commit graphs
| * | Remove unnecessary mmap usage from testsFilip Navara2019-05-071-6/+4
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Allow non-.git path for ls exampleFilip Navara2019-05-071-2/+6
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Add test parameters for ls exampleFilip Navara2019-05-071-0/+1
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Add example for commit-graph traversalFilip Navara2019-05-071-0/+268
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Add doc.go for commitgraph packagesFilip Navara2019-05-074-0/+113
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Fix object/commitgraph testsFilip Navara2019-05-031-0/+3
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Move CommitNode/CommitNodeIndex into separate object/commitgraph packageFilip Navara2019-05-035-20/+23
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Merge remote-tracking branch 'origin/master' into commitgraph-objFilip Navara2019-05-035-53/+96
| |\ \ | |/ / |/| |
generated by cgit (git 2.34.1) at 2024-11-14 22:00:35 +0000