mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Fix dump-repo git init, fix wrong error type for NullDownloader (#20182)
				
					
				
			* Fix `dump-repo` git init * fix wrong error type for NullDownloader
This commit is contained in:
		@@ -10,6 +10,7 @@ import (
 | 
				
			|||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"code.gitea.io/gitea/modules/convert"
 | 
						"code.gitea.io/gitea/modules/convert"
 | 
				
			||||||
 | 
						"code.gitea.io/gitea/modules/git"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/log"
 | 
						"code.gitea.io/gitea/modules/log"
 | 
				
			||||||
	base "code.gitea.io/gitea/modules/migration"
 | 
						base "code.gitea.io/gitea/modules/migration"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/setting"
 | 
						"code.gitea.io/gitea/modules/setting"
 | 
				
			||||||
@@ -83,6 +84,11 @@ func runDumpRepository(ctx *cli.Context) error {
 | 
				
			|||||||
		return err
 | 
							return err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// migrations.GiteaLocalUploader depends on git module
 | 
				
			||||||
 | 
						if err := git.InitSimple(context.Background()); err != nil {
 | 
				
			||||||
 | 
							return err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	log.Info("AppPath: %s", setting.AppPath)
 | 
						log.Info("AppPath: %s", setting.AppPath)
 | 
				
			||||||
	log.Info("AppWorkPath: %s", setting.AppWorkPath)
 | 
						log.Info("AppWorkPath: %s", setting.AppWorkPath)
 | 
				
			||||||
	log.Info("Custom path: %s", setting.CustomPath)
 | 
						log.Info("Custom path: %s", setting.CustomPath)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -284,7 +284,7 @@ func (b *ElasticSearchIndexer) Index(ctx context.Context, repo *repo_model.Repos
 | 
				
			|||||||
	reqs := make([]elastic.BulkableRequest, 0)
 | 
						reqs := make([]elastic.BulkableRequest, 0)
 | 
				
			||||||
	if len(changes.Updates) > 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!
 | 
							// 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)
 | 
								log.Error("Unable to open git repo: %s for %-v: %v", repo.RepoPath(), repo, err)
 | 
				
			||||||
			return err
 | 
								return err
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,52 +19,52 @@ func (n NullDownloader) SetContext(_ context.Context) {}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
// GetRepoInfo returns a repository information
 | 
					// GetRepoInfo returns a repository information
 | 
				
			||||||
func (n NullDownloader) GetRepoInfo() (*Repository, error) {
 | 
					func (n NullDownloader) GetRepoInfo() (*Repository, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "RepoInfo"}
 | 
						return nil, ErrNotSupported{Entity: "RepoInfo"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GetTopics return repository topics
 | 
					// GetTopics return repository topics
 | 
				
			||||||
func (n NullDownloader) GetTopics() ([]string, error) {
 | 
					func (n NullDownloader) GetTopics() ([]string, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "Topics"}
 | 
						return nil, ErrNotSupported{Entity: "Topics"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GetMilestones returns milestones
 | 
					// GetMilestones returns milestones
 | 
				
			||||||
func (n NullDownloader) GetMilestones() ([]*Milestone, error) {
 | 
					func (n NullDownloader) GetMilestones() ([]*Milestone, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "Milestones"}
 | 
						return nil, ErrNotSupported{Entity: "Milestones"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GetReleases returns releases
 | 
					// GetReleases returns releases
 | 
				
			||||||
func (n NullDownloader) GetReleases() ([]*Release, error) {
 | 
					func (n NullDownloader) GetReleases() ([]*Release, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "Releases"}
 | 
						return nil, ErrNotSupported{Entity: "Releases"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GetLabels returns labels
 | 
					// GetLabels returns labels
 | 
				
			||||||
func (n NullDownloader) GetLabels() ([]*Label, error) {
 | 
					func (n NullDownloader) GetLabels() ([]*Label, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "Labels"}
 | 
						return nil, ErrNotSupported{Entity: "Labels"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GetIssues returns issues according start and limit
 | 
					// GetIssues returns issues according start and limit
 | 
				
			||||||
func (n NullDownloader) GetIssues(page, perPage int) ([]*Issue, bool, error) {
 | 
					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
 | 
					// GetComments returns comments of an issue or PR
 | 
				
			||||||
func (n NullDownloader) GetComments(commentable Commentable) ([]*Comment, bool, error) {
 | 
					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
 | 
					// GetAllComments returns paginated comments
 | 
				
			||||||
func (n NullDownloader) GetAllComments(page, perPage int) ([]*Comment, bool, error) {
 | 
					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
 | 
					// GetPullRequests returns pull requests according page and perPage
 | 
				
			||||||
func (n NullDownloader) GetPullRequests(page, perPage int) ([]*PullRequest, bool, error) {
 | 
					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
 | 
					// GetReviews returns pull requests review
 | 
				
			||||||
func (n NullDownloader) GetReviews(reviewable Reviewable) ([]*Review, error) {
 | 
					func (n NullDownloader) GetReviews(reviewable Reviewable) ([]*Review, error) {
 | 
				
			||||||
	return nil, &ErrNotSupported{Entity: "Reviews"}
 | 
						return nil, ErrNotSupported{Entity: "Reviews"}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// FormatCloneURL add authentication into remote URLs
 | 
					// FormatCloneURL add authentication into remote URLs
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user