Skip to content

Commit 56e9746

Browse files
committed
Fix adopt repository has empty object name in database
1 parent a975ce8 commit 56e9746

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

services/context/repo.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,18 @@ func (r *Repository) CanCreateBranch() bool {
8484
}
8585

8686
func (r *Repository) GetObjectFormat() git.ObjectFormat {
87-
return git.ObjectFormatFromName(r.Repository.ObjectFormatName)
87+
if r.Repository.ObjectFormatName != "" {
88+
return git.ObjectFormatFromName(r.Repository.ObjectFormatName)
89+
}
90+
if r.GitRepo != nil {
91+
objectFormat, err := r.GitRepo.GetObjectFormat()
92+
if err == nil {
93+
return objectFormat
94+
}
95+
log.Error("Failed to get object format: %v", err)
96+
}
97+
98+
return git.Sha1ObjectFormat
8899
}
89100

90101
// RepoMustNotBeArchived checks if a repo is archived

services/repository/adopt.go

+6
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@ func adoptRepository(ctx context.Context, repoPath string, repo *repo_model.Repo
146146
}
147147
defer gitRepo.Close()
148148

149+
objectFormat, err := gitRepo.GetObjectFormat()
150+
if err != nil {
151+
return fmt.Errorf("getObjectFormat: %w", err)
152+
}
153+
repo.ObjectFormatName = objectFormat.Name()
154+
149155
if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, repo, gitRepo, 0); err != nil {
150156
return fmt.Errorf("SyncRepoBranchesWithRepo: %w", err)
151157
}

0 commit comments

Comments
 (0)