aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * plumbing: object, add APIs for traversing over commit graphsFilip Navara2019-04-243-0/+499
| |/ |/| | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
* | Merge pull request #1128 from filipnavara/commitgraph-fmtMáximo Cuadros2019-04-245-0/+689
|\ \ | | | | | | plumbing: format/commitgraph, add APIs for reading and writing commit-graph files
| * | Remove debug print, fix large edge count calculation to make the reencoded ↵Filip Navara2019-04-242-3/+1
| | | | | | | | | | | | | | | | | | file binary identical Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Split OpenFileIndex into smaller functionsFilip Navara2019-04-242-32/+51
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Split Encoder into smaller functionsFilip Navara2019-04-242-55/+95
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | Rename fixture tag to commit-graphFilip Navara2019-04-241-3/+3
| | | | | | | | | | | | Signed-off-by: Filip Navara <filip.navara@gmail.com>
| * | plumbing: format/commitgraph, add APIs for reading and writing commit-graph ↵Filip Navara2019-04-245-0/+632
| | | | | | | | | | | | | | | | | | files Signed-off-by: Filip Navara <filip.navara@gmail.com>
* | | Merge pull request #1121 from filipnavara/small-deltasMáximo Cuadros2019-04-241-56/+126
|\ \ \ | |/ / |/| | plumbing: packfile, apply small object reading optimization also for delta objects
| * | Populate the offsetToType cache in the iterator even for the skipped objectsFilip Navara2019-04-241-0/+3
| | | | | | | | | | | | Signed-off-by: Filip Navara <navara@emclient.com>
| * | Better fix for the getObjectType problem in the iteratorFilip Navara2019-04-241-6/+9
| | | | | | | | | | | | Signed-off-by: Filip Navara <navara@emclient.com>
| * | Remove duplicate cache lookup in getObjectContent, it is already done in ↵Filip Navara2019-04-241-13/+0
| | | | | | | | | | | | | | | | | | FSObject Signed-off-by: Filip Navara <navara@emclient.com>
generated by cgit (git 2.34.1) at 2024-11-18 09:01:25 +0000