aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #115 from blaueled/fix/gitignore-crlfMáximo Cuadros2020-07-142-11/+19
|\ | | | | .gitignore crlf fix
| * fix typoArne Westphal2020-06-291-1/+1
| |
| * test CRLF in GFS caseArne Westphal2020-06-291-4/+12
| |
| * replace ReadAll by bufio.scannerArne Westphal2020-06-291-6/+6
| |
* | Merge pull request #128 from cristaloleg/minor-perf-fixesMáximo Cuadros2020-07-142-2/+2
|\ \ | | | | | | Use EqualFold for comparison
| * | Use EqualFold for comparisonOleg Kovalov2020-07-062-2/+2
| | |
* | | Merge pull request #123 from cristaloleg/check-err-fixMáximo Cuadros2020-07-102-6/+8
|\ \ \ | | | | | | | | *: skip error check explicitly
| * | | Skip error check explicitlyOleg Kovalov2020-07-062-6/+8
| |/ /
* | | Merge pull request #121 from riking/cache-seekMáximo Cuadros2020-07-102-3/+42
|\ \ \ | | | | | | | | plumbing: memoryobject, make blob reader seekable
| * | | memoryobject: make blob reader seekableKane York2020-07-062-3/+42
| | | | | | | | | | | | | | | | Replace the bytes.Buffer with a bytes.Reader wrapped in a custom NopCloser, so that the extra reading methods are sill accessible.
* | | | Merge pull request #124 from cristaloleg/use-one-name-for-receiverMáximo Cuadros2020-07-108-54/+54
|\ \ \ \ | | | | | | | | | | *: use only one name for receiver
| * | | | Use only one name for receiverOleg Kovalov2020-07-068-54/+54
| | |/ / | |/| |
* | | | Merge pull request #127 from cristaloleg/dont-skip-errorMáximo Cuadros2020-07-101-2/+1
|\ \ \ \ | |/ / / |/| | | Dont skip error
| * | | Dont skip errorOleg Kovalov2020-07-061-2/+1
|/ / /
* | | Merge pull request #117 from cristaloleg/fix-goreportcardMáximo Cuadros2020-07-0654-75/+93
|\ \ \ | |_|/ |/| | fix goreportcard warnings
| * | fix nilOleg Kovalov2020-07-017-9/+11
| | |
| * | fix goreportcard warningsOleg Kovalov2020-07-0148-67/+83
|/ /
* | Merge pull request #109 from mruediger/masterMáximo Cuadros2020-06-242-1/+27
|\ \ | | | | | | Worktre: Pull, report "Already up to date" when local repository ahead of remote
| * | Report "Already up to date" when local repository ahead of remoteMathias Rüdiger2020-06-222-1/+27
|/ / | | | | | | | | | | | | If you run 'git pull', do a commit and run 'git pull' again git will report "Already up to date" whereas go-git would report a reports non-fast-forward update. This commit changes the behavior of go-git to match that of git.
* | Merge pull request #88 from distorhead/cherryPickCommonDirSupportMáximo Cuadros2020-06-168-2/+370
|\ \ | | | | | | storage: filesystem, support .git/commondir repository layout
| * | Support `.git/commondir` repository layoutTimofey Kirillov2020-06-158-2/+370
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git creates `.git/commondir` when there are custom worktrees (see "git worktree add" related commands). `.git/commondir` in such case contains a link to another dot-git repository tree, which could contain some folders like: - objects; - config; - refs; - etc. In this PR a new dotgit.RepositoryFilesystem struct is defined, which is billy.Filesystem interface compatible object-wrapper, that can handle commondir and dispatch all operations to the correct file path. `git.PlainOpen` remain unchanged, but `git.PlainOpenWithOptions` has a new option: `PlainOpenOptions.EnableDotGitCommonDir=true|false` (which is false by default). When `EnableDotGitCommonDir=true` repository-open procedure will read `.git/commondir` (if it exists) and then create dotgit.RepositoryFilesystem object initialized with 2 filesystems. This object then passed into storage and then into dotgit.DotGit as `billy.Filesystem` interface. This object will catch all filesystem operations and dispatch to the correct repository-filesystem (dot-git or common-dot-git) according to the rules described in the doc: https://git-scm.com/docs/gitrepository-layout#Documentation/gitrepository-layout.txt. EnableDotGitCommonDir option will only work with the filesystem-backed storage. Also worktree_test.go has been adopted from an older, already existing existing PR: https://github.com/src-d/go-git/pull/1098. This PR needs new fixtures added in the following PR: https://github.com/go-git/go-git-fixtures/pull/1.
* | _examples: tag-create-push, remove defaultSignatureMáximo Cuadros2020-06-141-16/+3
| |
* | Worktree.AddWithOptions: improve documentation and interfaceMáximo Cuadros2020-06-143-8/+46
| |
* | Merge pull request #80 from lcostea/masterMáximo Cuadros2020-06-142-0/+162
|\ \ | | | | | | examples: tag, Add create and push new tag
| * | Trigger workflowLiviu Costea2020-06-010-0/+0
| | |
| * | examples, tag: Show git commandLiviu Costea2020-06-011-13/+6
| | |
| * | examples: tag, Add create and push new tagLiviu Costea2020-05-312-0/+169
| |/
* | Merge pull request #86 from jk2K/masterMáximo Cuadros2020-06-143-36/+117
|\ \ | | | | | | feat: add file with using .gitignore, fixed src-d/go-git#1219
| * | feat: add file with using .gitignore, fixed src-d/go-git#1219jk2k2020-06-103-36/+117
|/ /
* | Merge pull request #84 from go-git/tag-authorMáximo Cuadros2020-06-054-12/+155
|\ \ | |/ |/| CreateTagOptions.Validate: load Tagger from config
| * CreateTagOptions.Validate: load Tagger from configMáximo Cuadros2020-06-054-12/+155
|/
* 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.
generated by cgit (git 2.34.1) at 2024-11-05 19:06:32 +0000