mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	update git module (#2037)
This commit is contained in:
		
							
								
								
									
										5
									
								
								vendor/code.gitea.io/git/commit.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								vendor/code.gitea.io/git/commit.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -235,6 +235,9 @@ func (c *Commit) GetSubModules() (*ObjectCache, error) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	entry, err := c.GetTreeEntryByPath(".gitmodules")
 | 
						entry, err := c.GetTreeEntryByPath(".gitmodules")
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
 | 
							if _, ok := err.(ErrNotExist); ok {
 | 
				
			||||||
 | 
								return nil, nil
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	rd, err := entry.Blob().Data()
 | 
						rd, err := entry.Blob().Data()
 | 
				
			||||||
@@ -273,9 +276,11 @@ func (c *Commit) GetSubModule(entryname string) (*SubModule, error) {
 | 
				
			|||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if modules != nil {
 | 
				
			||||||
		module, has := modules.Get(entryname)
 | 
							module, has := modules.Get(entryname)
 | 
				
			||||||
		if has {
 | 
							if has {
 | 
				
			||||||
			return module.(*SubModule), nil
 | 
								return module.(*SubModule), nil
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	return nil, nil
 | 
						return nil, nil
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								vendor/code.gitea.io/git/tree_entry.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/code.gitea.io/git/tree_entry.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -264,7 +264,9 @@ func getNextCommitInfos(state *getCommitInfoState) error {
 | 
				
			|||||||
					return fmt.Errorf("Unquote: %v", err)
 | 
										return fmt.Errorf("Unquote: %v", err)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			state.update(entryPath)
 | 
								if err = state.update(entryPath); err != nil {
 | 
				
			||||||
 | 
									return err
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		i++ // skip blank line
 | 
							i++ // skip blank line
 | 
				
			||||||
		if len(state.entries) == len(state.commits) {
 | 
							if len(state.entries) == len(state.commits) {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								vendor/vendor.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/vendor.json
									
									
									
									
										vendored
									
									
								
							@@ -3,10 +3,10 @@
 | 
				
			|||||||
	"ignore": "test appengine",
 | 
						"ignore": "test appengine",
 | 
				
			||||||
	"package": [
 | 
						"package": [
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"checksumSHA1": "Ve00iavGUw8bQmDeXuEJ51wEk40=",
 | 
								"checksumSHA1": "Ju4zZF8u/DPrZYEEY40rogh3hyQ=",
 | 
				
			||||||
			"path": "code.gitea.io/git",
 | 
								"path": "code.gitea.io/git",
 | 
				
			||||||
			"revision": "a34a13dea30c0d242c5256cc321b48f8041ce095",
 | 
								"revision": "51eca9e92242b93a0510edd19f1db6fc11ca1028",
 | 
				
			||||||
			"revisionTime": "2017-06-20T02:08:21Z"
 | 
								"revisionTime": "2017-06-21T01:06:07Z"
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",
 | 
								"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user