mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	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>
This commit is contained in:
		
							
								
								
									
										18
									
								
								cmd/hook.go
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								cmd/hook.go
									
									
									
									
									
								
							| @@ -201,7 +201,7 @@ Gitea or set your environment appropriately.`, "") | ||||
|  | ||||
| 	oldCommitIDs := make([]string, hookBatchSize) | ||||
| 	newCommitIDs := make([]string, hookBatchSize) | ||||
| 	refFullNames := make([]string, hookBatchSize) | ||||
| 	refFullNames := make([]git.RefName, hookBatchSize) | ||||
| 	count := 0 | ||||
| 	total := 0 | ||||
| 	lastline := 0 | ||||
| @@ -236,14 +236,14 @@ Gitea or set your environment appropriately.`, "") | ||||
|  | ||||
| 		oldCommitID := string(fields[0]) | ||||
| 		newCommitID := string(fields[1]) | ||||
| 		refFullName := string(fields[2]) | ||||
| 		refFullName := git.RefName(fields[2]) | ||||
| 		total++ | ||||
| 		lastline++ | ||||
|  | ||||
| 		// If the ref is a branch or tag, check if it's protected | ||||
| 		// if supportProcReceive all ref should be checked because | ||||
| 		// permission check was delayed | ||||
| 		if supportProcReceive || strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) { | ||||
| 		if supportProcReceive || refFullName.IsBranch() || refFullName.IsTag() { | ||||
| 			oldCommitIDs[count] = oldCommitID | ||||
| 			newCommitIDs[count] = newCommitID | ||||
| 			refFullNames[count] = refFullName | ||||
| @@ -351,7 +351,7 @@ Gitea or set your environment appropriately.`, "") | ||||
| 	} | ||||
| 	oldCommitIDs := make([]string, hookBatchSize) | ||||
| 	newCommitIDs := make([]string, hookBatchSize) | ||||
| 	refFullNames := make([]string, hookBatchSize) | ||||
| 	refFullNames := make([]git.RefName, hookBatchSize) | ||||
| 	count := 0 | ||||
| 	total := 0 | ||||
| 	wasEmpty := false | ||||
| @@ -373,7 +373,7 @@ Gitea or set your environment appropriately.`, "") | ||||
| 		fmt.Fprintf(out, ".") | ||||
| 		oldCommitIDs[count] = string(fields[0]) | ||||
| 		newCommitIDs[count] = string(fields[1]) | ||||
| 		refFullNames[count] = string(fields[2]) | ||||
| 		refFullNames[count] = git.RefName(fields[2]) | ||||
| 		if refFullNames[count] == git.BranchPrefix+"master" && newCommitIDs[count] != git.EmptySHA && count == total { | ||||
| 			masterPushed = true | ||||
| 		} | ||||
| @@ -575,7 +575,7 @@ Gitea or set your environment appropriately.`, "") | ||||
| 	} | ||||
| 	hookOptions.OldCommitIDs = make([]string, 0, hookBatchSize) | ||||
| 	hookOptions.NewCommitIDs = make([]string, 0, hookBatchSize) | ||||
| 	hookOptions.RefFullNames = make([]string, 0, hookBatchSize) | ||||
| 	hookOptions.RefFullNames = make([]git.RefName, 0, hookBatchSize) | ||||
|  | ||||
| 	for { | ||||
| 		// note: pktLineTypeUnknow means pktLineTypeFlush and pktLineTypeData all allowed | ||||
| @@ -593,7 +593,7 @@ Gitea or set your environment appropriately.`, "") | ||||
| 		} | ||||
| 		hookOptions.OldCommitIDs = append(hookOptions.OldCommitIDs, t[0]) | ||||
| 		hookOptions.NewCommitIDs = append(hookOptions.NewCommitIDs, t[1]) | ||||
| 		hookOptions.RefFullNames = append(hookOptions.RefFullNames, t[2]) | ||||
| 		hookOptions.RefFullNames = append(hookOptions.RefFullNames, git.RefName(t[2])) | ||||
| 	} | ||||
|  | ||||
| 	hookOptions.GitPushOptions = make(map[string]string) | ||||
| @@ -640,7 +640,7 @@ Gitea or set your environment appropriately.`, "") | ||||
|  | ||||
| 	for _, rs := range resp.Results { | ||||
| 		if len(rs.Err) > 0 { | ||||
| 			err = writeDataPktLine(ctx, os.Stdout, []byte("ng "+rs.OriginalRef+" "+rs.Err)) | ||||
| 			err = writeDataPktLine(ctx, os.Stdout, []byte("ng "+rs.OriginalRef.String()+" "+rs.Err)) | ||||
| 			if err != nil { | ||||
| 				return err | ||||
| 			} | ||||
| @@ -648,7 +648,7 @@ Gitea or set your environment appropriately.`, "") | ||||
| 		} | ||||
|  | ||||
| 		if rs.IsNotMatched { | ||||
| 			err = writeDataPktLine(ctx, os.Stdout, []byte("ok "+rs.OriginalRef)) | ||||
| 			err = writeDataPktLine(ctx, os.Stdout, []byte("ok "+rs.OriginalRef.String())) | ||||
| 			if err != nil { | ||||
| 				return err | ||||
| 			} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user