mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-20 07:35:00 +00:00
silverwind
cdf786ce92
`git commit --message=` passes the merge message as a single argument, which Linux caps at 128 KiB and Windows at 32 KiB for the whole command line. Long messages failed with `argument list too long` and the merge box toast showed the raw HTML 500 page. Pass the message via `--file=-` on stdin instead, and answer fetch-action requests with JSON on server errors so the toast shows the error text. Limits merge commit messages to 512KB which could be extended or made configurable later. Fixes: https://github.com/go-gitea/gitea/issues/39261 Fixes: https://github.com/go-gitea/gitea/issues/30276 Signed-off-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
83 lines
2.0 KiB
Go
83 lines
2.0 KiB
Go
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
"gitea.dev/modules/git/gitcmd"
|
|
)
|
|
|
|
// MaxGitObjectSize is used to avoid OOM when reading a large git object.
|
|
// GitHub has a limit (100M) for pushing, but Gitea doesn't have such a limit yet.
|
|
var MaxGitObjectSize int64 = 100 * 1024 * 1024
|
|
|
|
// ObjectType git object type
|
|
type ObjectType string
|
|
|
|
const (
|
|
// ObjectCommit commit object type
|
|
ObjectCommit ObjectType = "commit"
|
|
// ObjectTree tree object type
|
|
ObjectTree ObjectType = "tree"
|
|
// ObjectBlob blob object type
|
|
ObjectBlob ObjectType = "blob"
|
|
// ObjectTag tag object type
|
|
ObjectTag ObjectType = "tag"
|
|
// ObjectBranch branch object type
|
|
ObjectBranch ObjectType = "branch"
|
|
)
|
|
|
|
// Bytes returns the byte array for the Object Type
|
|
func (o ObjectType) Bytes() []byte {
|
|
return []byte(o)
|
|
}
|
|
|
|
func (repo *Repository) GetObjectFormat(ctx context.Context) (ObjectFormat, error) {
|
|
if repo.objectFormatCache != nil {
|
|
return repo.objectFormatCache, nil
|
|
}
|
|
|
|
str, err := repo.hashObjectBytes(ctx, nil, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
hash, err := NewIDFromString(str)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
repo.objectFormatCache = hash.Type()
|
|
|
|
return repo.objectFormatCache, nil
|
|
}
|
|
|
|
// HashObjectBytes returns hash for the content
|
|
func (repo *Repository) HashObjectBytes(ctx context.Context, buf []byte) (ObjectID, error) {
|
|
idStr, err := repo.hashObjectBytes(ctx, buf, true)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return NewIDFromString(idStr)
|
|
}
|
|
|
|
func (repo *Repository) hashObjectBytes(ctx context.Context, buf []byte, save bool) (string, error) {
|
|
var cmd *gitcmd.Command
|
|
if save {
|
|
cmd = gitcmd.NewCommand("hash-object", "-w", "--stdin")
|
|
} else {
|
|
cmd = gitcmd.NewCommand("hash-object", "--stdin")
|
|
}
|
|
stdout, _, err := cmd.
|
|
WithRepo(repo).
|
|
WithStdinBytes(buf).
|
|
RunStdString(ctx)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(stdout), nil
|
|
}
|