aboutsummaryrefslogtreecommitdiffstats
path: root/modules/repository
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2023-05-26 09:04:48 +0800
committerGitHub <noreply@github.com>2023-05-26 01:04:48 +0000
commitf9cfd6ce5bd7f27e2655fd307022461a802fc49c (patch)
tree9279cab7249c1c7e66a81e694f1096e709c1a8a1 /modules/repository
parent26fa94bc25ecba731a12af16b6172768389287a7 (diff)
downloadgitea-f9cfd6ce5bd7f27e2655fd307022461a802fc49c.tar.gz
gitea-f9cfd6ce5bd7f27e2655fd307022461a802fc49c.zip
Use the type RefName for all the needed places and fix pull mirror sync bugs (#24634)
This PR replaces all string refName as a type `git.RefName` to make the code more maintainable. Fix #15367 Replaces #23070 It also fixed a bug that tags are not sync because `git remote --prune origin` will not remove local tags if remote removed. We in fact should use `git fetch --prune --tags origin` but not `git remote update origin` to do the sync. Some answer from ChatGPT as ref. > If the git fetch --prune --tags command is not working as expected, there could be a few reasons why. Here are a few things to check: > >Make sure that you have the latest version of Git installed on your system. You can check the version by running git --version in your terminal. If you have an outdated version, try updating Git and see if that resolves the issue. > >Check that your Git repository is properly configured to track the remote repository's tags. You can check this by running git config --get-all remote.origin.fetch and verifying that it includes +refs/tags/*:refs/tags/*. If it does not, you can add it by running git config --add remote.origin.fetch "+refs/tags/*:refs/tags/*". > >Verify that the tags you are trying to prune actually exist on the remote repository. You can do this by running git ls-remote --tags origin to list all the tags on the remote repository. > >Check if any local tags have been created that match the names of tags on the remote repository. If so, these local tags may be preventing the git fetch --prune --tags command from working properly. You can delete local tags using the git tag -d command. --------- Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'modules/repository')
-rw-r--r--modules/repository/push.go41
-rw-r--r--modules/repository/repo.go11
2 files changed, 17 insertions, 35 deletions
diff --git a/modules/repository/push.go b/modules/repository/push.go
index aa1552351d..ea03f9e153 100644
--- a/modules/repository/push.go
+++ b/modules/repository/push.go
@@ -4,8 +4,6 @@
package repository
import (
- "strings"
-
"code.gitea.io/gitea/modules/git"
)
@@ -15,7 +13,7 @@ type PushUpdateOptions struct {
PusherName string
RepoUserName string
RepoName string
- RefFullName string // branch, tag or other name to push
+ RefFullName git.RefName // branch, tag or other name to push
OldCommitID string
NewCommitID string
}
@@ -35,59 +33,34 @@ func (opts *PushUpdateOptions) IsUpdateRef() bool {
return !opts.IsNewRef() && !opts.IsDelRef()
}
-// IsTag return true if it's an operation to a tag
-func (opts *PushUpdateOptions) IsTag() bool {
- return strings.HasPrefix(opts.RefFullName, git.TagPrefix)
-}
-
// IsNewTag return true if it's a creation to a tag
func (opts *PushUpdateOptions) IsNewTag() bool {
- return opts.IsTag() && opts.IsNewRef()
+ return opts.RefFullName.IsTag() && opts.IsNewRef()
}
// IsDelTag return true if it's a deletion to a tag
func (opts *PushUpdateOptions) IsDelTag() bool {
- return opts.IsTag() && opts.IsDelRef()
-}
-
-// IsBranch return true if it's a push to branch
-func (opts *PushUpdateOptions) IsBranch() bool {
- return strings.HasPrefix(opts.RefFullName, git.BranchPrefix)
+ return opts.RefFullName.IsTag() && opts.IsDelRef()
}
// IsNewBranch return true if it's the first-time push to a branch
func (opts *PushUpdateOptions) IsNewBranch() bool {
- return opts.IsBranch() && opts.IsNewRef()
+ return opts.RefFullName.IsBranch() && opts.IsNewRef()
}
// IsUpdateBranch return true if it's not the first push to a branch
func (opts *PushUpdateOptions) IsUpdateBranch() bool {
- return opts.IsBranch() && opts.IsUpdateRef()
+ return opts.RefFullName.IsBranch() && opts.IsUpdateRef()
}
// IsDelBranch return true if it's a deletion to a branch
func (opts *PushUpdateOptions) IsDelBranch() bool {
- return opts.IsBranch() && opts.IsDelRef()
-}
-
-// TagName returns simple tag name if it's an operation to a tag
-func (opts *PushUpdateOptions) TagName() string {
- return opts.RefFullName[len(git.TagPrefix):]
-}
-
-// BranchName returns simple branch name if it's an operation to branch
-func (opts *PushUpdateOptions) BranchName() string {
- return opts.RefFullName[len(git.BranchPrefix):]
+ return opts.RefFullName.IsBranch() && opts.IsDelRef()
}
// RefName returns simple name for ref
func (opts *PushUpdateOptions) RefName() string {
- if strings.HasPrefix(opts.RefFullName, git.TagPrefix) {
- return opts.RefFullName[len(git.TagPrefix):]
- } else if strings.HasPrefix(opts.RefFullName, git.BranchPrefix) {
- return opts.RefFullName[len(git.BranchPrefix):]
- }
- return ""
+ return opts.RefFullName.ShortName()
}
// RepoFullName returns repo full name
diff --git a/modules/repository/repo.go b/modules/repository/repo.go
index a1dba8fc6a..62e1f31b9e 100644
--- a/modules/repository/repo.go
+++ b/modules/repository/repo.go
@@ -200,7 +200,7 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
mirrorModel.Interval = 0
mirrorModel.NextUpdateUnix = 0
} else if parsedInterval < setting.Mirror.MinInterval {
- err := fmt.Errorf("Interval %s is set below Minimum Interval of %s", parsedInterval, setting.Mirror.MinInterval)
+ err := fmt.Errorf("interval %s is set below Minimum Interval of %s", parsedInterval, setting.Mirror.MinInterval)
log.Error("Interval: %s is too frequent", opts.MirrorInterval)
return repo, err
} else {
@@ -217,6 +217,15 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
if err = UpdateRepository(ctx, repo, false); err != nil {
return nil, err
}
+
+ // this is necessary for sync local tags from remote
+ configName := fmt.Sprintf("remote.%s.fetch", mirrorModel.GetRemoteName())
+ if stdout, _, err := git.NewCommand(ctx, "config").
+ AddOptionValues("--add", configName, `+refs/tags/*:refs/tags/*`).
+ RunStdString(&git.RunOpts{Dir: repoPath}); err != nil {
+ log.Error("MigrateRepositoryGitData(git config --add <remote> +refs/tags/*:refs/tags/*) in %v: Stdout: %s\nError: %v", repo, stdout, err)
+ return repo, fmt.Errorf("error in MigrateRepositoryGitData(git config --add <remote> +refs/tags/*:refs/tags/*): %w", err)
+ }
} else {
if err = UpdateRepoSize(ctx, repo); err != nil {
log.Error("Failed to update size for repository: %v", err)