Gitea-John71/Gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-13 08:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance(repo): add default object format setting (#38877)

Browse Source 
Adds `[repository] DEFAULT_OBJECT_FORMAT` to default new repositories to
`sha1` or `sha256`.

Applies the setting to repository creation defaults in the UI and API,
reducing repeated manual selection.

Docs: https://gitea.com/gitea/docs/pulls/504

Fixes https://github.com/go-gitea/gitea/issues/38854

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
bircni
2026-08-12 18:12:57 +02:00
committed by GitHub
parent 3f833fd681
commit 2551f9949a
6 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom/conf/app.example.ini
+3
View File
@@ -1112,6 +1112,9 @@ LEVEL = Info
;; The default branch name of new repositories
;DEFAULT_BRANCH = main
;;
;; The default Git object format of new repositories. Available values: sha1, sha256.
;DEFAULT_OBJECT_FORMAT = sha1
;;
;; Allow adoption of unadopted repositories
;ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES = false
;;
modules/git/object_format.go
+37 -4
View File
@@ -115,9 +115,42 @@ func (h Sha256ObjectFormatImpl) ComputeHash(t ObjectType, content []byte) Object
return h.MustID(hasher.Sum(nil))
}
type invalidObjectFormatImpl struct{}
var emptyInvalidObjectID = &Sha1Hash{}
func (h invalidObjectFormatImpl) Name() string {
return "invalid-object-format"
}
func (h invalidObjectFormatImpl) EmptyObjectID() ObjectID {
return emptyInvalidObjectID
}
func (h invalidObjectFormatImpl) EmptyTree() ObjectID {
return emptyInvalidObjectID
}
func (h invalidObjectFormatImpl) FullLength() int {
return len(emptyInvalidObjectID) * 2
}
func (h invalidObjectFormatImpl) IsValid(input string) bool {
return false
}
func (h invalidObjectFormatImpl) MustID(b []byte) ObjectID {
return emptyInvalidObjectID
}
func (h invalidObjectFormatImpl) ComputeHash(t ObjectType, content []byte) ObjectID {
return emptyInvalidObjectID
}
var (
Sha1ObjectFormat ObjectFormat = Sha1ObjectFormatImpl{}
Sha256ObjectFormat ObjectFormat = Sha256ObjectFormatImpl{}
Sha1ObjectFormat ObjectFormat = Sha1ObjectFormatImpl{}
Sha256ObjectFormat ObjectFormat = Sha256ObjectFormatImpl{}
invalidObjectFormat ObjectFormat = invalidObjectFormatImpl{}
)
func ObjectFormatFromName(name string) ObjectFormat {
@@ -126,9 +159,9 @@ func ObjectFormatFromName(name string) ObjectFormat {
return objectFormat
}
}
return nil
return invalidObjectFormat
}
func IsValidObjectFormat(name string) bool {
return ObjectFormatFromName(name) != nil
return ObjectFormatFromName(name) != invalidObjectFormat
}
modules/git/object_id_test.go
+13 -8
View File
@@ -10,14 +10,13 @@ import (
)
func TestIsValidSHAPattern(t *testing.T) {
h := Sha1ObjectFormat
assert.True(t, h.IsValid("fee1"))
assert.True(t, h.IsValid("abc000"))
assert.True(t, h.IsValid("9023902390239023902390239023902390239023"))
assert.False(t, h.IsValid("90239023902390239023902390239023902390239023"))
assert.False(t, h.IsValid("abc"))
assert.False(t, h.IsValid("123g"))
assert.False(t, h.IsValid("some random text"))
assert.True(t, Sha1ObjectFormat.IsValid("fee1"))
assert.True(t, Sha1ObjectFormat.IsValid("abc000"))
assert.True(t, Sha1ObjectFormat.IsValid("9023902390239023902390239023902390239023"))
assert.False(t, Sha1ObjectFormat.IsValid("90239023902390239023902390239023902390239023"))
assert.False(t, Sha1ObjectFormat.IsValid("abc"))
assert.False(t, Sha1ObjectFormat.IsValid("123g"))
assert.False(t, Sha1ObjectFormat.IsValid("some random text"))
assert.Equal(t, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", ComputeBlobHash(Sha1ObjectFormat, nil).String())
assert.Equal(t, "2e65efe2a145dda7ee51d1741299f848e5bf752e", ComputeBlobHash(Sha1ObjectFormat, []byte("a")).String())
assert.Equal(t, "473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813", ComputeBlobHash(Sha256ObjectFormat, nil).String())
@@ -25,3 +24,9 @@ func TestIsValidSHAPattern(t *testing.T) {
assert.True(t, IsEmptyCommitID(""))
assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000"))
}
func TestInvalidObjectFormat(t *testing.T) {
of := ObjectFormatFromName("no-such")
assert.NotNil(t, of)
assert.False(t, IsValidObjectFormat("no-such"))
}
modules/setting/repository.go
+2
View File
@@ -57,6 +57,7 @@ var (
DisableMigrations bool
DisableStars bool `ini:"DISABLE_STARS"`
DefaultBranch string
DefaultObjectFormat string
AllowAdoptionOfUnadoptedRepositories bool
AllowDeleteOfUnadoptedRepositories bool
DisableDownloadSourceArchives bool
@@ -186,6 +187,7 @@ var (
DisableMigrations: false,
DisableStars: false,
DefaultBranch: "main",
DefaultObjectFormat: "sha1",
AllowForkWithoutMaximumLimit: true,
StreamArchives: true,
routers/web/repo/repo.go
+1 -1
View File
@@ -135,7 +135,7 @@ func createCommon(ctx *context.Context) {
ctx.Data["CanCreateRepoInDoer"] = ctx.Doer.CanCreateRepoIn(ctx.Doer)
ctx.Data["MaxCreationLimitOfDoer"] = ctx.Doer.MaxCreationLimit()
ctx.Data["SupportedObjectFormats"] = git.DefaultFeatures().SupportedObjectFormats
ctx.Data["DefaultObjectFormat"] = git.Sha1ObjectFormat
ctx.Data["DefaultObjectFormat"] = git.ObjectFormatFromName(setting.Repository.DefaultObjectFormat)
}
// Create render creating repository page
templates/repo/create.tmpl
+4 -4
View File
@@ -185,12 +185,12 @@
</div>
<div class="inline field">
<label>{{ctx.Locale.Tr "repo.object_format"}}</label>
<div class="ui selection owner dropdown">
<input type="hidden" id="object_format_name" name="object_format_name" value="{{or .object_format_name .DefaultObjectFormat.Name}}" required>
<div class="ui selection dropdown">
<input type="hidden" name="object_format_name" value="{{or .object_format_name .DefaultObjectFormat.Name}}">
<div class="default text">{{.DefaultObjectFormat.Name}}</div>
<div class="menu">
{{range .SupportedObjectFormats}}
<div class="item" data-value="{{.Name}}">{{.Name}}</div>
{{range $objFmt := .SupportedObjectFormats}}
<div class="item" data-value="{{$objFmt.Name}}">{{$objFmt.Name}}</div>
{{end}}
</div>
</div>