mirror of
				https://github.com/actions/checkout.git
				synced 2025-11-04 11:35:09 +08:00 
			
		
		
		
	Support fetching without the --progress option (#1067)
Setting the `show-progress` option to false in the `with` section of the workflow step will cause git fetch to run without `--progress`. The motivation is to be able to suppress the noisy progress status output which adds many hundreds of "remote: Counting objects: 85% (386/453)" and similar lines in the workflow log. This should be sufficient to resolve #894 and its older friends, though the solution is different to the one proposed there because it doesn't use the --quiet flag. IIUC git doesn't show the progress status by default since the output is not a terminal, so that's why removing the --progress option is all that's needed. Adding the --quiet flag doesn't make a lot of difference once the --progress flag is removed, and actually I think using --quiet would suppress some other more useful output that would be better left visible. Signed-off-by: Simon Baird <sbaird@redhat.com>
This commit is contained in:
		@@ -806,6 +806,7 @@ async function setup(testName: string): Promise<void> {
 | 
			
		||||
    sparseCheckoutConeMode: true,
 | 
			
		||||
    fetchDepth: 1,
 | 
			
		||||
    fetchTags: false,
 | 
			
		||||
    showProgress: true,
 | 
			
		||||
    lfs: false,
 | 
			
		||||
    submodules: false,
 | 
			
		||||
    nestedSubmodules: false,
 | 
			
		||||
 
 | 
			
		||||
@@ -135,7 +135,6 @@ describe('Test fetchDepth and fetchTags options', () => {
 | 
			
		||||
        'protocol.version=2',
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        'origin',
 | 
			
		||||
@@ -174,7 +173,6 @@ describe('Test fetchDepth and fetchTags options', () => {
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--no-tags',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        'origin',
 | 
			
		||||
@@ -213,7 +211,6 @@ describe('Test fetchDepth and fetchTags options', () => {
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--no-tags',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        '--depth=1',
 | 
			
		||||
@@ -252,7 +249,6 @@ describe('Test fetchDepth and fetchTags options', () => {
 | 
			
		||||
        'protocol.version=2',
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        '--depth=1',
 | 
			
		||||
@@ -263,4 +259,120 @@ describe('Test fetchDepth and fetchTags options', () => {
 | 
			
		||||
      expect.any(Object)
 | 
			
		||||
    )
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  it('should call execGit with the correct arguments when showProgress is true', async () => {
 | 
			
		||||
    jest.spyOn(exec, 'exec').mockImplementation(mockExec)
 | 
			
		||||
 | 
			
		||||
    const workingDirectory = 'test'
 | 
			
		||||
    const lfs = false
 | 
			
		||||
    const doSparseCheckout = false
 | 
			
		||||
    git = await commandManager.createCommandManager(
 | 
			
		||||
      workingDirectory,
 | 
			
		||||
      lfs,
 | 
			
		||||
      doSparseCheckout
 | 
			
		||||
    )
 | 
			
		||||
    const refSpec = ['refspec1', 'refspec2']
 | 
			
		||||
    const options = {
 | 
			
		||||
      filter: 'filterValue',
 | 
			
		||||
      showProgress: true
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    await git.fetch(refSpec, options)
 | 
			
		||||
 | 
			
		||||
    expect(mockExec).toHaveBeenCalledWith(
 | 
			
		||||
      expect.any(String),
 | 
			
		||||
      [
 | 
			
		||||
        '-c',
 | 
			
		||||
        'protocol.version=2',
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--no-tags',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        'origin',
 | 
			
		||||
        'refspec1',
 | 
			
		||||
        'refspec2'
 | 
			
		||||
      ],
 | 
			
		||||
      expect.any(Object)
 | 
			
		||||
    )
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  it('should call execGit with the correct arguments when fetchDepth is 42 and showProgress is true', async () => {
 | 
			
		||||
    jest.spyOn(exec, 'exec').mockImplementation(mockExec)
 | 
			
		||||
 | 
			
		||||
    const workingDirectory = 'test'
 | 
			
		||||
    const lfs = false
 | 
			
		||||
    const doSparseCheckout = false
 | 
			
		||||
    git = await commandManager.createCommandManager(
 | 
			
		||||
      workingDirectory,
 | 
			
		||||
      lfs,
 | 
			
		||||
      doSparseCheckout
 | 
			
		||||
    )
 | 
			
		||||
    const refSpec = ['refspec1', 'refspec2']
 | 
			
		||||
    const options = {
 | 
			
		||||
      filter: 'filterValue',
 | 
			
		||||
      fetchDepth: 42,
 | 
			
		||||
      showProgress: true
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    await git.fetch(refSpec, options)
 | 
			
		||||
 | 
			
		||||
    expect(mockExec).toHaveBeenCalledWith(
 | 
			
		||||
      expect.any(String),
 | 
			
		||||
      [
 | 
			
		||||
        '-c',
 | 
			
		||||
        'protocol.version=2',
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--no-tags',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        '--depth=42',
 | 
			
		||||
        'origin',
 | 
			
		||||
        'refspec1',
 | 
			
		||||
        'refspec2'
 | 
			
		||||
      ],
 | 
			
		||||
      expect.any(Object)
 | 
			
		||||
    )
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  it('should call execGit with the correct arguments when fetchTags is true and showProgress is true', async () => {
 | 
			
		||||
    jest.spyOn(exec, 'exec').mockImplementation(mockExec)
 | 
			
		||||
 | 
			
		||||
    const workingDirectory = 'test'
 | 
			
		||||
    const lfs = false
 | 
			
		||||
    const doSparseCheckout = false
 | 
			
		||||
    git = await commandManager.createCommandManager(
 | 
			
		||||
      workingDirectory,
 | 
			
		||||
      lfs,
 | 
			
		||||
      doSparseCheckout
 | 
			
		||||
    )
 | 
			
		||||
    const refSpec = ['refspec1', 'refspec2']
 | 
			
		||||
    const options = {
 | 
			
		||||
      filter: 'filterValue',
 | 
			
		||||
      fetchTags: true,
 | 
			
		||||
      showProgress: true
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    await git.fetch(refSpec, options)
 | 
			
		||||
 | 
			
		||||
    expect(mockExec).toHaveBeenCalledWith(
 | 
			
		||||
      expect.any(String),
 | 
			
		||||
      [
 | 
			
		||||
        '-c',
 | 
			
		||||
        'protocol.version=2',
 | 
			
		||||
        'fetch',
 | 
			
		||||
        '--prune',
 | 
			
		||||
        '--no-recurse-submodules',
 | 
			
		||||
        '--progress',
 | 
			
		||||
        '--filter=filterValue',
 | 
			
		||||
        'origin',
 | 
			
		||||
        'refspec1',
 | 
			
		||||
        'refspec2'
 | 
			
		||||
      ],
 | 
			
		||||
      expect.any(Object)
 | 
			
		||||
    )
 | 
			
		||||
  })
 | 
			
		||||
})
 | 
			
		||||
 
 | 
			
		||||
@@ -83,6 +83,7 @@ describe('input-helper tests', () => {
 | 
			
		||||
    expect(settings.sparseCheckoutConeMode).toBe(true)
 | 
			
		||||
    expect(settings.fetchDepth).toBe(1)
 | 
			
		||||
    expect(settings.fetchTags).toBe(false)
 | 
			
		||||
    expect(settings.showProgress).toBe(true)
 | 
			
		||||
    expect(settings.lfs).toBe(false)
 | 
			
		||||
    expect(settings.ref).toBe('refs/heads/some-ref')
 | 
			
		||||
    expect(settings.repositoryName).toBe('some-repo')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user