Merge branch 'main' into harry/pnpm-trust-downgrade-version-fallback

Author: thavaahariharangit

common/lib/dependabot/workspace/git.rb

@@ -71,7 +71,7 @@ def store_change(memo = nil)
           .returns(T.nilable(T::Array[Dependabot::Workspace::ChangeAttempt]))
       end
       def capture_failed_change_attempt(memo = nil, error = nil)
-        return nil if changed_files(ignored_mode: "matching").empty? && error.nil?
+        return nil if changed_files(ignored_mode: "matching").empty?
 
         sha = stash(memo)
         change_attempts << ChangeAttempt.new(self, id: sha, memo: memo, error: error)

common/spec/dependabot/workspace/git_spec.rb

@@ -137,6 +137,17 @@
           expect(workspace.failed_change_attempts.size).to eq(1)
         end
       end
+
+      context "when error occurs with no file changes" do
+        it "does not record a change attempt" do
+          expect do
+            workspace.change("no changes error") { raise "boom" }
+          end.to raise_error(RuntimeError, "boom")
+
+          expect(workspace.change_attempts).to be_empty
+          expect(workspace.failed_change_attempts).to be_empty
+        end
+      end
     end
   end