fastlane/lib/fastlane/fast_file.rb in fastlane-2.211.0 vs fastlane/lib/fastlane/fast_file.rb in fastlane-2.212.0

@@ -336,14 +336,27 @@
             end
 
             UI.user_error!("No tag found matching #{version.inspect}") if checkout_param.nil?
           end
 
-          if is_eligible_for_caching && version.nil?
-            # Update the repo if it's eligible for caching but the version isn't specified
-            UI.message("Fetching remote git branches and updating git repo...")
-            Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
-              Actions.sh("cd #{clone_folder.shellescape} && git fetch --all --quiet && git checkout #{checkout_param.shellescape} #{checkout_path} && git reset --hard && git rebase")
+          if is_eligible_for_caching
+            if version.nil?
+              # Update the repo if it's eligible for caching but the version isn't specified
+              UI.message("Fetching remote git branches and updating git repo...")
+              Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
+                Actions.sh("cd #{clone_folder.shellescape} && git fetch --all --quiet && git checkout #{checkout_param.shellescape} #{checkout_path} && git reset --hard && git rebase")
+              end
+            else
+              begin
+                # https://stackoverflow.com/a/1593574/865175
+                current_tag = Actions.sh("cd #{clone_folder.shellescape} && git describe --exact-match --tags HEAD").strip
+              rescue
+                current_tag = nil
+              end
+
+              if current_tag != version
+                Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{checkout_path}")
+              end
             end
           else
             Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{checkout_path}")
           end