summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2022-07-01 07:48:25 +0800
committerGitHub <noreply@github.com>2022-07-01 07:48:25 +0800
commitd6c0aa7f1cfa1271d8273a5be7d31e4dc8e0d9f3 (patch)
tree9130f85803274a73f278b335e5fb2a014288a5c7 /modules
parent184a7d4195baffb169f24f4e9a4524f8d4045e91 (diff)
downloadgitea-d6c0aa7f1cfa1271d8273a5be7d31e4dc8e0d9f3.tar.gz
gitea-d6c0aa7f1cfa1271d8273a5be7d31e4dc8e0d9f3.zip
Fix `dump-repo` git init, fix wrong error type for NullDownloader (#20182)
* Fix `dump-repo` git init * fix wrong error type for NullDownloader
Diffstat (limited to 'modules')
-rw-r--r--modules/indexer/code/elastic_search.go2
-rw-r--r--modules/migration/null_downloader.go20
2 files changed, 11 insertions, 11 deletions
diff --git a/modules/indexer/code/elastic_search.go b/modules/indexer/code/elastic_search.go
index a669c66bb4..7727bfacde 100644
--- a/modules/indexer/code/elastic_search.go
+++ b/modules/indexer/code/elastic_search.go
@@ -284,7 +284,7 @@ func (b *ElasticSearchIndexer) Index(ctx context.Context, repo *repo_model.Repos
reqs := make([]elastic.BulkableRequest, 0)
if len(changes.Updates) > 0 {
// Now because of some insanity with git cat-file not immediately failing if not run in a valid git directory we need to run git rev-parse first!
- if err := git.EnsureValidGitRepository(git.DefaultContext, repo.RepoPath()); err != nil {
+ if err := git.EnsureValidGitRepository(ctx, repo.RepoPath()); err != nil {
log.Error("Unable to open git repo: %s for %-v: %v", repo.RepoPath(), repo, err)
return err
}
diff --git a/modules/migration/null_downloader.go b/modules/migration/null_downloader.go
index 32da720f16..ad925c32ce 100644
--- a/modules/migration/null_downloader.go
+++ b/modules/migration/null_downloader.go
@@ -19,52 +19,52 @@ func (n NullDownloader) SetContext(_ context.Context) {}
// GetRepoInfo returns a repository information
func (n NullDownloader) GetRepoInfo() (*Repository, error) {
- return nil, &ErrNotSupported{Entity: "RepoInfo"}
+ return nil, ErrNotSupported{Entity: "RepoInfo"}
}
// GetTopics return repository topics
func (n NullDownloader) GetTopics() ([]string, error) {
- return nil, &ErrNotSupported{Entity: "Topics"}
+ return nil, ErrNotSupported{Entity: "Topics"}
}
// GetMilestones returns milestones
func (n NullDownloader) GetMilestones() ([]*Milestone, error) {
- return nil, &ErrNotSupported{Entity: "Milestones"}
+ return nil, ErrNotSupported{Entity: "Milestones"}
}
// GetReleases returns releases
func (n NullDownloader) GetReleases() ([]*Release, error) {
- return nil, &ErrNotSupported{Entity: "Releases"}
+ return nil, ErrNotSupported{Entity: "Releases"}
}
// GetLabels returns labels
func (n NullDownloader) GetLabels() ([]*Label, error) {
- return nil, &ErrNotSupported{Entity: "Labels"}
+ return nil, ErrNotSupported{Entity: "Labels"}
}
// GetIssues returns issues according start and limit
func (n NullDownloader) GetIssues(page, perPage int) ([]*Issue, bool, error) {
- return nil, false, &ErrNotSupported{Entity: "Issues"}
+ return nil, false, ErrNotSupported{Entity: "Issues"}
}
// GetComments returns comments of an issue or PR
func (n NullDownloader) GetComments(commentable Commentable) ([]*Comment, bool, error) {
- return nil, false, &ErrNotSupported{Entity: "Comments"}
+ return nil, false, ErrNotSupported{Entity: "Comments"}
}
// GetAllComments returns paginated comments
func (n NullDownloader) GetAllComments(page, perPage int) ([]*Comment, bool, error) {
- return nil, false, &ErrNotSupported{Entity: "AllComments"}
+ return nil, false, ErrNotSupported{Entity: "AllComments"}
}
// GetPullRequests returns pull requests according page and perPage
func (n NullDownloader) GetPullRequests(page, perPage int) ([]*PullRequest, bool, error) {
- return nil, false, &ErrNotSupported{Entity: "PullRequests"}
+ return nil, false, ErrNotSupported{Entity: "PullRequests"}
}
// GetReviews returns pull requests review
func (n NullDownloader) GetReviews(reviewable Reviewable) ([]*Review, error) {
- return nil, &ErrNotSupported{Entity: "Reviews"}
+ return nil, ErrNotSupported{Entity: "Reviews"}
}
// FormatCloneURL add authentication into remote URLs