lib/itamae/resource/git.rb in itamae-1.0.0.beta20 vs lib/itamae/resource/git.rb in itamae-1.0.0.beta21

@@ -13,25 +13,15 @@
       def pre_action
         case action
         when :sync
           @attributes[:exist?] = true
         end
-
-        @attributes[:revision_hash] = if revision
-                                        get_revision(revision)
-                                      else
-                                        run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
-                                      end
       end
 
       def set_current_attributes
         exist = run_specinfra(:check_file_is_directory, destination)
         @current_attributes[:exist?] = exist
-
-        if exist
-          @current_attributes[:revision_hash] = get_revision('HEAD')
-        end
       end
 
       def sync_action
         ensure_git_available
 
@@ -42,19 +32,25 @@
         else
           run_command(['git', 'clone', repository, destination])
           new_repository = true
         end
 
-        if new_repository || @attributes[:revision_hash] != get_revision('HEAD')
+        target = if revision
+                   get_revision(revision)
+                 else
+                   run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
+                 end
+
+        if new_repository || target != get_revision('HEAD')
           updated!
 
           deploy_old_created = false
           if current_branch == DEPLOY_BRANCH
             run_command_in_repo("git branch -m deploy-old")
             deploy_old_created = true
           end
 
-          run_command_in_repo(["git", "checkout", @attributes[:revision_hash], "-b", DEPLOY_BRANCH])
+          run_command_in_repo(["git", "checkout", target, "-b", DEPLOY_BRANCH])
 
           if deploy_old_created
             run_command_in_repo("git branch -d deploy-old")
           end
         end