Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | plumbing: object, Commit.Patch support to as nil | Máximo Cuadros | 2020-05-13 | 3 | -4/+27 | |
|/ / | ||||||
| * | Repository.SetConfig, shortcut to Repository.Storer.SetConfig | Máximo Cuadros | 2020-05-24 | 1 | -1/+10 | |
| | | ||||||
| * | Repository.ConfigScoped and Repository.Commit with empty author support | Máximo Cuadros | 2020-05-24 | 8 | -27/+117 | |
| | | ||||||
| * | config: ReadConfig and LoadConfig from scopes | Máximo Cuadros | 2020-05-24 | 3 | -15/+94 | |
| | | ||||||
| * | config: Config.[User|Author|Commit] marshal/unmarshal | Máximo Cuadros | 2020-05-24 | 2 | -8/+103 | |
| | | ||||||
| * | Revert "Merge pull request #20 from quorumcontrol/feature/other-configs" | Máximo Cuadros | 2020-05-24 | 7 | -612/+35 | |
| | | | | | | | | | | This reverts commit 3127ad9a44a2ee935502816065dfe39f494f583d, reversing changes made to 73c52edaad2dae256be61bd1dbbab08e1092f58e. | |||||
| * | Revert "Merge pull request #31 from lcostea/liviu/add_save_config_changes" | Máximo Cuadros | 2020-05-24 | 1 | -4/+0 | |
|/ | | | | | This reverts commit 53f87846a196c856e00fe825bc5f29551b2ea524, reversing changes made to bb3a1bfcc62224001d577b933355661259b80854. | |||||
* | Merge pull request #58 from go-git/exact-sha1 | Máximo Cuadros | 2020-05-11 | 6 | -5/+100 | |
|\ | | | | | Remote.Fetch: support exact SHA1 refspecs | |||||
| * | Remote.Fetch: support exact SHA1 refspecs | Máximo Cuadros | 2020-05-11 | 2 | -2/+62 | |
| | | ||||||
| * | config: RefSpec.IsExactSHA1, validates if the refspec describes an exact ↵ | Máximo Cuadros | 2020-05-10 | 4 | -3/+38 | |
| | | | | | | | | SHA1 ref | |||||
* | | Merge pull request #57 from vashish1/Rename_Changed | Máximo Cuadros | 2020-05-10 | 1 | -4/+4 | |
|\ \ | |/ |/| | plumbing: object, Fixed the ambiguous implicit conversions causing errors while building . | |||||
| * | performed explicit conversions(needed) | vashish1 | 2020-05-08 | 1 | -4/+4 | |
|/ | ||||||
* | Merge pull request #54 from go-git/fix/rename-exact-gaps | Máximo Cuadros | 2020-05-04 | 2 | -8/+30 | |
|\ | | | | | plumbing: exact renames detection could leave gaps in the changes | |||||
| * | plumbing: exact renames detection could leave gaps in the changes | Miguel Molina | 2020-05-04 | 2 | -8/+30 | |
|/ | | | | | | | | | This fixes an issue where exact renames detection could leave gaps with nil changes in the added and deleted change slices. That could lead to panics in the content rename detection and others if the user had set OnlyExact to true. Signed-off-by: Miguel Molina <miguel@erizocosmi.co> | |||||
* | Merge pull request #47 from twpayne/diff-cleanup | Máximo Cuadros | 2020-05-01 | 1 | -216/+166 | |
|\ | | | | | Cleanup `diff` package | |||||
| * | plumbing: diff, refresh internals | Tom Payne | 2020-05-01 | 1 | -216/+166 | |
|/ | ||||||
* | Merge pull request #49 from gopye/fix_patch_comment | Máximo Cuadros | 2020-04-30 | 1 | -1/+1 | |
|\ | | | | | Remove unnecessary text from comment | |||||
| * | Remove unnecessary text from comment | gopye | 2020-04-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #46 from twpayne/fix-diff-color | Máximo Cuadros | 2020-04-30 | 4 | -30/+68 | |
|\ \ | | | | | | | Fix issues in colored diffs | |||||
| * | | plumbing: diff, don't emit unnecessary resets | Tom Payne | 2020-04-30 | 3 | -22/+24 | |
| | | | ||||||
| * | | plumbing: color, make package external | Tom Payne | 2020-04-29 | 3 | -2/+2 | |
| | | | ||||||
| * | | plumbing: diff, fix coloring of hunk context | Tom Payne | 2020-04-29 | 2 | -15/+51 | |
| | | | ||||||
* | | | Merge pull request #44 from tzneal/mine/fix-32-bit-build | Máximo Cuadros | 2020-04-30 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | fix 32 bit build | |||||
| * | | fix 32 bit build | Todd Neal | 2020-04-27 | 1 | -1/+1 | |
| |/ | | | | | | | Discovered while building on a Raspberry Pi | |||||
* | | Merge pull request #45 from gopye/fix_change_test_typo | Máximo Cuadros | 2020-04-29 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix typo | |||||
| * | Fix typo in comment of func TestCancel | gopye | 2020-04-27 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #42 from mcuadros/renames-tree | Máximo Cuadros | 2020-04-27 | 3 | -16/+55 | |
|\ | | | | | plumbing: object, make renames diff default | |||||
| * | Merge branch 'master' of github.com:go-git/go-git into renames-tree | Máximo Cuadros | 2020-04-25 | 1 | -4/+5 | |
| |\ | ||||||
| * | | plumbing: object, make renames diff default | Máximo Cuadros | 2020-04-25 | 3 | -16/+55 | |
| | | | ||||||
* | | | Merge pull request #40 from twpayne/feature/diff-color | Máximo Cuadros | 2020-04-26 | 4 | -10/+244 | |
|\ \ \ | |_|/ |/| | | Add initial colored diff support | |||||
| * | | plumbing: diff, Add initial colored output support. Fixes #33. | Tom Payne | 2020-04-26 | 4 | -10/+244 | |
|/ / | ||||||
* | | Merge pull request #43 from go-git/fix-git-compatibility | Máximo Cuadros | 2020-04-25 | 1 | -4/+5 | |
|\ \ | |/ |/| | ci: fix CI, git compaitiblity | |||||
| * | ci: fix CI, git compaitiblity | Máximo Cuadros | 2020-04-25 | 1 | -4/+5 | |
|/ | ||||||
* | Merge pull request #39 from kevans91/fixread | Máximo Cuadros | 2020-04-24 | 2 | -1/+24 | |
|\ | | | | | storage/filesystem: dotgit, sanity check provided reference path | |||||
| * | storage/filesystem: dotgit, sanity check provided reference path | Kyle Evans | 2020-04-23 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | On some operating systems, read() of a directory fd may actually succeed and return garbage resembling on-disk contents. As a result, dotgit may return successful from readReferenceFile() when it should in-fact not. This fixes readReferenceFile() on FreeBSD. Signed-off-by: Kyle Evans <kevans@FreeBSD.org> | |||||
| * | storage/filesystem: dotgit, add a test for reading refs from a directory | Kyle Evans | 2020-04-23 | 1 | -1/+13 | |
|/ | | | | | | Specifically, the problem demonstrated is that on some OS (e.g. FreeBSD), read() on a directory will succeed. The current implementation will accept that and return incorrect results, rather than rejecting the directory. | |||||
* | Merge pull request #38 from go-git/feature/difftree-renames | Máximo Cuadros | 2020-04-23 | 5 | -8/+1382 | |
|\ | | | | | plumbing: detect renames by hash and similar content in diff tree | |||||
| * | plumbing: detect renames by hash and similar content in diff tree | Miguel Molina | 2020-04-23 | 5 | -8/+1382 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit implements the rename detection algorithms used in the JGit implementation. Given a list of changes, additions and deletions are extracted and matched in two ways: - By exact hash content: all additions and deletions are grouped by the content hash and paired with the best match based on the file mode and file path. All the files that cannot be paired are kept as regular deletions and additions. - By similar content: a matrix of addition and deletion pairs with all possible combinations is created and scored by how similar the content is between both files as well as how similar the file path is. The pairs with the best score and whose score is equal or greater than a threshold are paired and turned into a rename. All the files that cannot be paired are kept as regular deletions and additions. DiffTree and DiffTreeContext will not return the changes with renames detected for compatibility reasons, although this will change in v6 so that detecting renames is the default behaviour. A new function DiffTreeWithOptions has been added to configure the parameters for the rename detection to control the score threshold, the limit of renames and whether to use similar content detection in the detection. More information: - https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java - https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java - https://github.com/eclipse/jgit/blob/master/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java Signed-off-by: Miguel Molina <miguel@erizocosmi.co> | |||||
* | | Merge pull request #31 from lcostea/liviu/add_save_config_changes | Máximo Cuadros | 2020-04-18 | 1 | -0/+4 | |
|\ \ | |/ |/| | examples: config, Show how to save config changes | |||||
| * | examples: config, Show how to save config changes | Liviu Costea | 2020-04-18 | 1 | -0/+4 | |
|/ | ||||||
* | Merge pull request #29 from empire/patch-1 | Máximo Cuadros | 2020-04-16 | 1 | -1/+1 | |
|\ | | | | | Fix example's link in README.md | |||||
| * | Fix example's link in README.md | Hossein Zolfi | 2020-04-16 | 1 | -1/+1 | |
|/ | | | Fix example's link in README.md. It refers to the old project location. | |||||
* | Merge pull request #27 from davorao/master | Máximo Cuadros | 2020-04-14 | 1 | -1/+1 | |
|\ | | | | | Change the link of the storer docs | |||||
| * | Change the link of the storer docs | davorao | 2020-04-13 | 1 | -1/+1 | |
|/ | | | | | Change storer: - from godoc.org - to pkg.go.dev | |||||
* | Merge pull request #20 from quorumcontrol/feature/other-configs | Máximo Cuadros | 2020-04-07 | 7 | -35/+612 | |
|\ | | | | | plumbing: format, config.Merged to allow access to local and global config | |||||
| * | Simplify a couple of config examples | Wes Morgan | 2020-04-07 | 1 | -2/+2 | |
| | | ||||||
| * | Add advanced usage note to config example | Wes Morgan | 2020-04-07 | 1 | -0/+4 | |
| | | ||||||
| * | Document some things in format/config/merged.go | Wes Morgan | 2020-04-07 | 1 | -1/+39 | |
| | | ||||||
| * | Fix dotgit tests | Wes Morgan | 2020-04-06 | 1 | -3/+3 | |
| | | ||||||
| * | Add funcs to set global & local config in Merged | Wes Morgan | 2020-04-06 | 1 | -0/+8 | |
| | |