mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	format with gofumpt (#18184)
* gofumpt -w -l . * gofumpt -w -l -extra . * Add linter * manual fix * change make fmt
This commit is contained in:
		@@ -26,7 +26,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*models.CommitStatus, re
 | 
			
		||||
		return structs.CommitStatusSuccess
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	var returnedStatus = structs.CommitStatusSuccess
 | 
			
		||||
	returnedStatus := structs.CommitStatusSuccess
 | 
			
		||||
	for _, ctx := range requiredContexts {
 | 
			
		||||
		var targetStatus structs.CommitStatusState
 | 
			
		||||
		for _, commitStatus := range commitStatuses {
 | 
			
		||||
 
 | 
			
		||||
@@ -165,13 +165,13 @@ func rawMerge(ctx context.Context, pr *models.PullRequest, doer *user_model.User
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	infoPath := filepath.Join(tmpBasePath, ".git", "info")
 | 
			
		||||
	if err := os.MkdirAll(infoPath, 0700); err != nil {
 | 
			
		||||
	if err := os.MkdirAll(infoPath, 0o700); err != nil {
 | 
			
		||||
		log.Error("Unable to create .git/info in %s: %v", tmpBasePath, err)
 | 
			
		||||
		return "", fmt.Errorf("Unable to create .git/info in tmpBasePath: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
 | 
			
		||||
	if err := os.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
 | 
			
		||||
	if err := os.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0o600); err != nil {
 | 
			
		||||
		log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err)
 | 
			
		||||
		return "", fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %v", err)
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -24,7 +24,6 @@ import (
 | 
			
		||||
 | 
			
		||||
// CreateCodeComment creates a comment on the code line
 | 
			
		||||
func CreateCodeComment(ctx context.Context, doer *user_model.User, gitRepo *git.Repository, issue *models.Issue, line int64, content, treePath string, isReview bool, replyReviewID int64, latestCommitID string) (*models.Comment, error) {
 | 
			
		||||
 | 
			
		||||
	var (
 | 
			
		||||
		existsReview bool
 | 
			
		||||
		err          error
 | 
			
		||||
 
 | 
			
		||||
@@ -70,7 +70,7 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
 | 
			
		||||
	// Add head repo remote.
 | 
			
		||||
	addCacheRepo := func(staging, cache string) error {
 | 
			
		||||
		p := filepath.Join(staging, ".git", "objects", "info", "alternates")
 | 
			
		||||
		f, err := os.OpenFile(p, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
 | 
			
		||||
		f, err := os.OpenFile(p, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o600)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Error("Could not create .git/objects/info/alternates file in %s: %v", staging, err)
 | 
			
		||||
			return err
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,7 @@ func Update(ctx context.Context, pull *models.PullRequest, doer *user_model.User
 | 
			
		||||
		pr = pull
 | 
			
		||||
		style = repo_model.MergeStyleRebaseUpdate
 | 
			
		||||
	} else {
 | 
			
		||||
		//use merge functions but switch repo's and branch's
 | 
			
		||||
		// use merge functions but switch repo's and branch's
 | 
			
		||||
		pr = &models.PullRequest{
 | 
			
		||||
			HeadRepoID: pull.BaseRepoID,
 | 
			
		||||
			BaseRepoID: pull.HeadRepoID,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user