aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ | |/ / |/| |
* | | Merge pull request #1090 from dweomer/ssh-proxy-from-environmentMáximo Cuadros2019-05-024-2/+68
|\ \ \ | | | | | | | | ssh: leverage proxy from environment
| * | | ssh: leverage proxy.DialJacob Blain Christen2019-05-024-2/+68
|/ / / | | | | | | | | | | | | | | | | | | This enables interacting with git remotes over SSH when behind a SOCKSv5 firewall. Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
* | | Merge pull request #1136 from filipnavara/idxfile-nobufMáximo Cuadros2019-04-271-51/+28
|\ \ \ | | | | | | | | plumbing: format/idxfile, avoid creating temporary buffers to decode integers
| * | | plumbing: format/idxfile, avoid looking up the fanout mapping in the ↵Filip Navara2019-04-261-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | iterator twice Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | | plumbing: format/idxfile, save another 18% of time in genOffsetHash by not ↵Filip Navara2019-04-251-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | using iterator and not loading CRC Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | | plumbing: format/idxfile, avoid creating temporary buffers to decode integersFilip Navara2019-04-251-32/+15
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Expose Generation property on CommitNodeFilip Navara2019-04-293-0/+18
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | pluming: object, adjust to new API names in format/commitgraphFilip Navara2019-04-262-19/+19
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Merge branch 'master' into commitgraph-objFilip Navara2019-04-2618-67/+1165
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1134 from filipnavara/commitgraph-fmt-3Máximo Cuadros2019-04-265-63/+61
|\ \ \ \ | |/ / / |/| | | plumbing: format/commitgraph, rename structs/fields to follow the terms used by git more closely
| * | | plumbing: format/commitgraph, rename structs/fields to follow the terms used ↵Filip Navara2019-04-255-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | by git more closely Signed-off-by: Filip Navara <navara@emclient.com>
| * | | plumbing: format/commitgraph, clean up error handlingFilip Navara2019-04-253-6/+4
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <navara@emclient.com>
* | | | Merge pull request #1127 from sapk-fork/imp-1116Máximo Cuadros2019-04-254-4/+57
|\ \ \ \ | |/ / / |/| | | plumbing: object/{commit,tag} add EncodeWithoutSignature, Implement #1116
| * | | plumbing: object/{commit,tag} add EncodeWithoutSignature, Implement #1116Antoine GIRARD2019-04-244-4/+57
|/ / / | | | | | | | | | Signed-off-by: Antoine GIRARD <sapk@sapk.fr>
* | | plumbing: commit.Stats, fix panic on empty chucksMáximo Cuadros2019-04-241-0/+4
| | | | | | | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | | Merge pull request #1130 from saracen/gitattributesMáximo Cuadros2019-04-248-0/+1043
|\ \ \ | | | | | | | | plumbing: format/gitattributes support
| * | | plumbing: format/gitattributes supportArran Walker2019-04-248-0/+1043
| | | | | | | | | | | | | | | | | | | | | | | | Implements gitattributes parsing, matching and attribute extraction. Signed-off-by: Arran Walker <arran.walker@fiveturns.org>
| | * | Add test for CommitNode.Commit() and CommitNode.Tree()Filip Navara2019-04-241-17/+27
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Add test for traversal on mixed object and commit-graphFilip Navara2019-04-241-0/+30
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Update commentsFilip Navara2019-04-243-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Add test for CommitNode.ParentNodes()Filip Navara2019-04-241-2/+26
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Code cleanup, split into more files for clarityFilip Navara2019-04-243-205/+200
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Move Commit() to CommitNode APIFilip Navara2019-04-241-11/+19
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| | * | Simplify the CommitNode API, make it look more like CommitFilip Navara2019-04-243-87/+65
| | | | | | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
generated by cgit (git 2.34.1) at 2024-11-18 03:03:43 +0000