diff options
| author | 6543 <6543@obermui.de> | 2022-01-20 18:46:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 18:46:10 +0100 |
| commit | 54e9ee37a7a301dbe74d46fd3c87712e6120e9bf (patch) | |
| tree | 1be12fb072625c1b896b9d72f7912b018aad502b /services/pull/merge.go | |
| parent | 1d98d205f5825f40110e6628b61a97c91ac7f72d (diff) | |
| download | gitea-54e9ee37a7a301dbe74d46fd3c87712e6120e9bf.tar.gz gitea-54e9ee37a7a301dbe74d46fd3c87712e6120e9bf.zip | |
format with gofumpt (#18184)
* gofumpt -w -l .
* gofumpt -w -l -extra .
* Add linter
* manual fix
* change make fmt
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 2a67507a87..d2196b22d5 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -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) } |