aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert "Merge pull request #20 from quorumcontrol/feature/other-configs"Máximo Cuadros2020-05-247-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 Cuadros2020-05-241-4/+0
|/ | | | | This reverts commit 53f87846a196c856e00fe825bc5f29551b2ea524, reversing changes made to bb3a1bfcc62224001d577b933355661259b80854.
* Merge pull request #58 from go-git/exact-sha1Máximo Cuadros2020-05-116-5/+100
|\ | | | | Remote.Fetch: support exact SHA1 refspecs
| * Remote.Fetch: support exact SHA1 refspecsMáximo Cuadros2020-05-112-2/+62
| |
| * config: RefSpec.IsExactSHA1, validates if the refspec describes an exact ↵Máximo Cuadros2020-05-104-3/+38
| | | | | | | | SHA1 ref
* | Merge pull request #57 from vashish1/Rename_ChangedMáximo Cuadros2020-05-101-4/+4
|\ \ | |/ |/| plumbing: object, Fixed the ambiguous implicit conversions causing errors while building .
| * performed explicit conversions(needed)vashish12020-05-081-4/+4
|/
* Merge pull request #54 from go-git/fix/rename-exact-gapsMáximo Cuadros2020-05-042-8/+30
|\ | | | | plumbing: exact renames detection could leave gaps in the changes
| * plumbing: exact renames detection could leave gaps in the changesMiguel Molina2020-05-042-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-cleanupMáximo Cuadros2020-05-011-216/+166
|\ | | | | Cleanup `diff` package
| * plumbing: diff, refresh internalsTom Payne2020-05-011-216/+166
|/
* Merge pull request #49 from gopye/fix_patch_commentMáximo Cuadros2020-04-301-1/+1
|\ | | | | Remove unnecessary text from comment
| * Remove unnecessary text from commentgopye2020-04-291-1/+1
| |
* | Merge pull request #46 from twpayne/fix-diff-colorMáximo Cuadros2020-04-304-30/+68
|\ \ | | | | | | Fix issues in colored diffs
| * | plumbing: diff, don't emit unnecessary resetsTom Payne2020-04-303-22/+24
| | |
| * | plumbing: color, make package externalTom Payne2020-04-293-2/+2
| | |
| * | plumbing: diff, fix coloring of hunk contextTom Payne2020-04-292-15/+51
| | |
* | | Merge pull request #44 from tzneal/mine/fix-32-bit-buildMáximo Cuadros2020-04-301-1/+1
|\ \ \ | |/ / |/| | fix 32 bit build
| * | fix 32 bit buildTodd Neal2020-04-271-1/+1
| |/ | | | | | | Discovered while building on a Raspberry Pi
* | Merge pull request #45 from gopye/fix_change_test_typoMáximo Cuadros2020-04-291-1/+1
|\ \ | |/ |/| Fix typo
| * Fix typo in comment of func TestCancelgopye2020-04-271-1/+1
|/
* Merge pull request #42 from mcuadros/renames-treeMáximo Cuadros2020-04-273-16/+55
|\ | | | | plumbing: object, make renames diff default
| * Merge branch 'master' of github.com:go-git/go-git into renames-treeMáximo Cuadros2020-04-251-4/+5
| |\
| * | plumbing: object, make renames diff defaultMáximo Cuadros2020-04-253-16/+55
| | |
* | | Merge pull request #40 from twpayne/feature/diff-colorMáximo Cuadros2020-04-264-10/+244
|\ \ \ | |_|/ |/| | Add initial colored diff support
| * | plumbing: diff, Add initial colored output support. Fixes #33.Tom Payne2020-04-264-10/+244
|/ /
* | Merge pull request #43 from go-git/fix-git-compatibilityMáximo Cuadros2020-04-251-4/+5
|\ \ | |/ |/| ci: fix CI, git compaitiblity
| * ci: fix CI, git compaitiblityMáximo Cuadros2020-04-251-4/+5
|/
* Merge pull request #39 from kevans91/fixreadMáximo Cuadros2020-04-242-1/+24
|\ | | | | storage/filesystem: dotgit, sanity check provided reference path
| * storage/filesystem: dotgit, sanity check provided reference pathKyle Evans2020-04-232-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 directoryKyle Evans2020-04-231-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-renamesMáximo Cuadros2020-04-235-8/+1382
|\ | | | | plumbing: detect renames by hash and similar content in diff tree
| * plumbing: detect renames by hash and similar content in diff treeMiguel Molina2020-04-235-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_changesMáximo Cuadros2020-04-181-0/+4
|\ \ | |/ |/| examples: config, Show how to save config changes
| * examples: config, Show how to save config changesLiviu Costea2020-04-181-0/+4
|/
* Merge pull request #29 from empire/patch-1Máximo Cuadros2020-04-161-1/+1
|\ | | | | Fix example's link in README.md
| * Fix example's link in README.mdHossein Zolfi2020-04-161-1/+1
|/ | | Fix example's link in README.md. It refers to the old project location.
* Merge pull request #27 from davorao/masterMáximo Cuadros2020-04-141-1/+1
|\ | | | | Change the link of the storer docs
| * Change the link of the storer docsdavorao2020-04-131-1/+1
|/ | | | | Change storer: - from godoc.org - to pkg.go.dev
* Merge pull request #20 from quorumcontrol/feature/other-configsMáximo Cuadros2020-04-077-35/+612
|\ | | | | plumbing: format, config.Merged to allow access to local and global config
| * Simplify a couple of config examplesWes Morgan2020-04-071-2/+2
| |
| * Add advanced usage note to config exampleWes Morgan2020-04-071-0/+4
| |
| * Document some things in format/config/merged.goWes Morgan2020-04-071-1/+39
| |
| * Fix dotgit testsWes Morgan2020-04-061-3/+3
| |
| * Add funcs to set global & local config in MergedWes Morgan2020-04-061-0/+8
| |
| * Add Merged configWes Morgan2020-04-066-32/+559
| | | | | | | | ...for reading and writing global (~/.git/config) and reading system (/etc/gitconfig) configs in addition to local repo config
* | Merge pull request #24 from jfontan/fix-compatibility-testsMáximo Cuadros2020-04-071-5/+4
|\ \ | | | | | | ci: fix compatibility tests for master
| * | ci: fix compatibility testsJavi Fontan2020-04-071-5/+4
|/ / | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
* | Merge pull request #22 from mcuadros/fix-emptyMáximo Cuadros2020-04-073-9/+30
|\ \ | |/ |/| plumbing: transport, fix handling of empty adv-refs on upload-pack
| * plumbing: transport, fix handling of empty adv-refs on upload-packMáximo Cuadros2020-04-073-9/+30
| |
generated by cgit (git 2.34.1) at 2024-11-16 09:25:24 +0000