From c17b111f1904133ebe94df0cad0bd6d34bd8ce05 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 18 Sep 2023 22:09:24 +0100 Subject: [PATCH 1/3] Use git stash 'push' rather than deprecated git stash 'save' --- lib/puppet/provider/vcsrepo/git.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 306013d3..7fe6178c 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -505,7 +505,7 @@ def set_excludes # @!visibility private def stash - at_path { git_with_identity('stash', 'save') } + at_path { git_with_identity('stash', 'push') } end # @!visibility private From 654931759283b964d6ffc62a715672c5c2b90efc Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 18 Sep 2023 22:11:37 +0100 Subject: [PATCH 2/3] Fix a bug when 'keep_local_changes => true' is set 'git stash push' and then 'git stash pop' could be called on a fresh clone, and that caused 'git stash pop' to fail. --- lib/puppet/provider/vcsrepo/git.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 7fe6178c..70d93c41 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -423,8 +423,9 @@ def commits? # handle upstream branch changes # @!visibility private def checkout(revision = @resource.value(:revision)) + has_changes = uncommitted_changes? keep_local_changes = @resource.value(:keep_local_changes) - stash if keep_local_changes == :true + stash if has_changes == :true && keep_local_changes == :true if !local_branch_revision?(revision) && remote_branch_revision?(revision) # non-locally existant branches (perhaps switching to a branch that has never been checked out) at_path { git_with_identity('checkout', '--force', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") } @@ -432,7 +433,7 @@ def checkout(revision = @resource.value(:revision)) # tags, locally existant branches (perhaps outdated), and shas at_path { git_with_identity('checkout', '--force', revision) } end - unstash if keep_local_changes == :true + unstash if has_changes == :true && keep_local_changes == :true end # @!visibility private @@ -503,6 +504,13 @@ def set_excludes end end + # @!visibility private + def uncommitted_changes? + at_path do + git_with_identity('status', '--porcelain').empty? + end + end + # @!visibility private def stash at_path { git_with_identity('stash', 'push') } From ad9f4d5a66e0da89c2b3095cbb6aaceb3ece4003 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 18 Sep 2023 23:46:29 +0100 Subject: [PATCH 3/3] Address code-review comments --- lib/puppet/provider/vcsrepo/git.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 70d93c41..2982efbf 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -425,7 +425,7 @@ def commits? def checkout(revision = @resource.value(:revision)) has_changes = uncommitted_changes? keep_local_changes = @resource.value(:keep_local_changes) - stash if has_changes == :true && keep_local_changes == :true + stash if has_changes && keep_local_changes == :true if !local_branch_revision?(revision) && remote_branch_revision?(revision) # non-locally existant branches (perhaps switching to a branch that has never been checked out) at_path { git_with_identity('checkout', '--force', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") } @@ -433,7 +433,7 @@ def checkout(revision = @resource.value(:revision)) # tags, locally existant branches (perhaps outdated), and shas at_path { git_with_identity('checkout', '--force', revision) } end - unstash if has_changes == :true && keep_local_changes == :true + unstash if has_changes && keep_local_changes == :true end # @!visibility private