mirror of
				https://code.forgejo.org/actions/checkout.git
				synced 2025-11-04 06:39:11 +00:00 
			
		
		
		
	Merge 1bf7689f6b into ff7abcd0c3
				
					
				
			This commit is contained in:
		
						commit
						3a1baf17a9
					
				
					 3 changed files with 18 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -482,6 +482,7 @@ describe('git-auth-helper tests', () => {
 | 
			
		|||
      )
 | 
			
		||||
      settings.persistCredentials = false
 | 
			
		||||
      settings.sshKey = ''
 | 
			
		||||
      settings.submodules = true
 | 
			
		||||
      const authHelper = gitAuthHelper.createAuthHelper(git, settings)
 | 
			
		||||
      await authHelper.configureAuth()
 | 
			
		||||
      const mockSubmoduleForeach = git.submoduleForeach as jest.Mock<any, any>
 | 
			
		||||
| 
						 | 
				
			
			@ -515,6 +516,7 @@ describe('git-auth-helper tests', () => {
 | 
			
		|||
        configureSubmoduleAuth_configuresSubmodulesWhenPersistCredentialsFalseAndSshKeySet
 | 
			
		||||
      )
 | 
			
		||||
      settings.persistCredentials = false
 | 
			
		||||
      settings.submodules = true
 | 
			
		||||
      const authHelper = gitAuthHelper.createAuthHelper(git, settings)
 | 
			
		||||
      await authHelper.configureAuth()
 | 
			
		||||
      const mockSubmoduleForeach = git.submoduleForeach as jest.Mock<any, any>
 | 
			
		||||
| 
						 | 
				
			
			@ -541,6 +543,7 @@ describe('git-auth-helper tests', () => {
 | 
			
		|||
        configureSubmoduleAuth_configuresSubmodulesWhenPersistCredentialsTrueAndSshKeyNotSet
 | 
			
		||||
      )
 | 
			
		||||
      settings.sshKey = ''
 | 
			
		||||
      settings.submodules = true
 | 
			
		||||
      const authHelper = gitAuthHelper.createAuthHelper(git, settings)
 | 
			
		||||
      await authHelper.configureAuth()
 | 
			
		||||
      const mockSubmoduleForeach = git.submoduleForeach as jest.Mock<any, any>
 | 
			
		||||
| 
						 | 
				
			
			@ -580,6 +583,7 @@ describe('git-auth-helper tests', () => {
 | 
			
		|||
      await setup(
 | 
			
		||||
        configureSubmoduleAuth_configuresSubmodulesWhenPersistCredentialsTrueAndSshKeySet
 | 
			
		||||
      )
 | 
			
		||||
      settings.submodules = true
 | 
			
		||||
      const authHelper = gitAuthHelper.createAuthHelper(git, settings)
 | 
			
		||||
      await authHelper.configureAuth()
 | 
			
		||||
      const mockSubmoduleForeach = git.submoduleForeach as jest.Mock<any, any>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								dist/index.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -424,10 +424,12 @@ class GitAuthHelper {
 | 
			
		|||
                    core.warning(`Failed to remove '${configKey}' from the git config`);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            if (this.settings.submodules) {
 | 
			
		||||
                const pattern = regexpHelper.escape(configKey);
 | 
			
		||||
                yield this.git.submoduleForeach(
 | 
			
		||||
                // wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline
 | 
			
		||||
                `sh -c "git config --local --name-only --get-regexp '${pattern}' && git config --local --unset-all '${configKey}' || :"`, true);
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -364,6 +364,7 @@ class GitAuthHelper {
 | 
			
		|||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (this.settings.submodules) {
 | 
			
		||||
      const pattern = regexpHelper.escape(configKey)
 | 
			
		||||
      await this.git.submoduleForeach(
 | 
			
		||||
        // wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline
 | 
			
		||||
| 
						 | 
				
			
			@ -372,3 +373,4 @@ class GitAuthHelper {
 | 
			
		|||
      )
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue