Merge pull request #566 from KoenDierckx/main

Only remove safe_directory, if it exists

Author: pmcmaw

lib/puppet/provider/vcsrepo/git.rb

@@ -42,7 +42,7 @@ def create
   end
 
   def destroy
-    remove_safe_directory if safe_directories.include?(@resource.value(:path))
+    remove_safe_directory
     FileUtils.rm_rf(@resource.value(:path))
   end
 
@@ -167,7 +167,7 @@ def update_remote_url(remote_name, remote_url)
       git_with_identity('remote', 'add', remote_name, remote_url)
       true
 
-    # If remote exists, but URL doesn't match, update URL
+      # If remote exists, but URL doesn't match, update URL
     elsif !current.include? "remote.#{remote_name}.url=#{remote_url}"
       git_with_identity('remote', 'set-url', remote_name, remote_url)
       true
@@ -642,6 +642,8 @@ def add_safe_directory
 
   # @!visibility private
   def remove_safe_directory
+    return unless safe_directories.include?(@resource.value(:path))
+
     notice("Removing '#{@resource.value(:path)}' from safe directory list")
     args = ['config', '--global', '--unset', 'safe.directory', @resource.value(:path)]
     git_with_identity(*args)