aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #73 from WKBae/close_objectv5.1.0Máximo Cuadros2020-05-248-14/+55
|\ | | | | Close Reader & Writer of EncodedObject after use
| * Close Reader & Writer of EncodedObject after useKyungmin Bae2020-05-248-14/+55
| |
* | Merge pull request #75 from mcuadros/scope-configMáximo Cuadros2020-05-2417-682/+376
|\ \ | |/ |/| repository.ConfigScoped and worktree.Commit with empty CommitOptions
| * _examples: config exampleMáximo Cuadros2020-05-242-18/+20
| |
| * Merge branch 'master' of github.com:go-git/go-git into scope-configMáximo Cuadros2020-05-2410-41/+187
| |\ | |/ |/|
* | Merge pull request #71 from kappyhappy/masterMáximo Cuadros2020-05-213-1/+41
|\ \ | | | | | | Remote.Push: support force option
| * | Remote.Push: support force optionkappyhappy2020-05-213-1/+41
|/ /
* | Merge pull request #63 from pyaillet/doc/submodule-update-exampleMáximo Cuadros2020-05-192-0/+56
|\ \ | | | | | | _examples: submodule, adding an example with submodule update
| * | doc: add submodule to example indexPierre-Yves Aillet2020-05-181-0/+1
| | |
| * | _examples: submodule, adding an example with submodule updatePierre-Yves Aillet2020-05-141-0/+55
| | | | | | | | | | | | | | | the goal of this pull request is to add an example of how to make the equivalent of `git submodule update --remote` with `go-git`
* | | Merge pull request #66 from twpayne/diff-reset-color-on-lineMáximo Cuadros2020-05-182-37/+64
|\ \ \ | |/ / |/| | plumbing: diff, reset color at end of line
| * | plumbing: diff, reset color at end of line rather than at beginning of nextTom Payne2020-05-172-37/+64
|/ /
* | Merge pull request #62 from mcuadros/commit-patch-nilMáximo Cuadros2020-05-133-4/+27
|\ \ | | | | | | plumbing: object, Commit.Patch support to as nil
| * | plumbing: object, Commit.Patch support to as nilMáximo Cuadros2020-05-133-4/+27
|/ /
| * Repository.SetConfig, shortcut to Repository.Storer.SetConfigMáximo Cuadros2020-05-241-1/+10
| |
| * Repository.ConfigScoped and Repository.Commit with empty author supportMáximo Cuadros2020-05-248-27/+117
| |
| * config: ReadConfig and LoadConfig from scopesMáximo Cuadros2020-05-243-15/+94
| |
| * config: Config.[User|Author|Commit] marshal/unmarshalMáximo Cuadros2020-05-242-8/+103
| |
| * 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