Fix an issue with stash

[adamretter]

Summary

If you use this to clone a new repo but also have keep_local_changes => true set then the git stash pop will fail with an error. This corrects the problem.

Checklist

• 🟢 Spec tests.
• 🟢 Acceptance tests.
• Manually verified. (For example puppet apply)

[CLAassistant]

All committers have signed the CLA.

[adamretter]

@kenyon Just wondering if we could get this re-reviewed and merged?

[kenyon]

I don't work for Puppet. Someone from Puppet needs to let the tests run. I'd also suggest a more descriptive title for the pull request, since the title is used in the changelog.

[smortex]

This change the sequence of commands run, you need to adjust CI to take this into account (see failed CI at the bottom of the "Conversation" tab).

---

Need guidance? Read on 😃

When reading the output from RSpec, you can identify 3 sections:

1. The output of the various tests with some details on failures;
2. A list of all failures details with backtraces;
3. A list of failed tests.

3 is the most handy to locate the tests you want to adjust (direct view of files and lines), while 1 & 2 tell you what is wrong.

If you consider the first failure in the "third section", you see that the error occurred in this test:

puppetlabs-vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb

Lines 34 to 44 in 2b05c3a

	it "executes 'git clone' and 'git checkout -b'" do
	resource[:revision] = 'only/remote'
	expect(Dir).to receive(:chdir).with('/').once.and_yield
	expect(Dir).to receive(:chdir).with('/tmp/test').at_least(:once).and_yield
	expect(provider).to receive(:exec_git).with('clone', resource.value(:source), resource.value(:path))
	expect(provider).to receive(:update_submodules)
	expect(provider).to receive(:update_remote_url).with('origin', resource.value(:source)).and_return false
	expect(provider).to receive(:exec_git).with('branch', '--no-color', '-a').and_return(branch_a_list(resource.value(:revision)))
	expect(provider).to receive(:exec_git).with('checkout', '--force', resource.value(:revision))
	provider.create
	end

If you scroll up in the second section, you see the actual error:

  1) Puppet::Type::Vcsrepo::ProviderGit when with an ensure of present when with an ensure of present - with a revision that is a remote branch executes 'git clone' and 'git checkout -b'
     Failure/Error: exec_git(*args)

       Vcsrepo[test](provider=git) received :exec_git with unexpected arguments
         expected: ("branch", "--no-color", "-a")
              got: ("status", "--porcelain")
     # ./lib/puppet/provider/vcsrepo/git.rb:691:in `git_with_identity'
     # ./lib/puppet/provider/vcsrepo/git.rb:510:in `block in uncommitted_changes?'
     # ./lib/puppet/provider/vcsrepo.rb:53:in `block in at_path'
     # ./lib/puppet/provider/vcsrepo.rb:52:in `at_path'
     # ./lib/puppet/provider/vcsrepo/git.rb:509:in `uncommitted_changes?'
     # ./lib/puppet/provider/vcsrepo/git.rb:426:in `checkout'
     # ./lib/puppet/provider/vcsrepo/git.rb:22:in `create'
     # ./spec/unit/puppet/provider/vcsrepo/git_spec.rb:43:in `block (4 levels) in <top (required)>'
     # ./vendor/bundle/ruby/2.7.0/bin/rspec:23:in `load'
     # ./vendor/bundle/ruby/2.7.0/bin/rspec:23:in `<top (required)>'
     # /opt/hostedtoolcache/Ruby/2.7.8/x64/bin/bundle:23:in `load'
     # /opt/hostedtoolcache/Ruby/2.7.8/x64/bin/bundle:23:in `<main>'

In this case, adding a line like the following one between lines 40 and 41 should fix the issue:

   expect(provider).to receive(:exec_git).with('status', '--porcelain').and_return('') 

---

Thanks!