fix: fix Rubocop Lint/SuppressedException offense

jcouball · jcouball · commit 4372a20b0b61 · 2025-07-03T16:10:33.000-07:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -6,14 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-
-# Offense count: 2
-# Configuration parameters: AllowComments, AllowNil.
-Lint/SuppressedException:
-  Exclude:
-    - 'lib/git/lib.rb'
-    - 'tests/units/test_each_conflict.rb'
-
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -707,12 +707,7 @@ def worktree_prune
 
     def list_files(ref_dir)
       dir = File.join(@git_dir, 'refs', ref_dir)
-      files = []
-      begin
-        files = Dir.glob('**/*', base: dir).select { |f| File.file?(File.join(dir, f)) }
-      rescue StandardError
-      end
-      files
+      Dir.glob('**/*', base: dir).select { |f| File.file?(File.join(dir, f)) }
     end
 
     # The state and name of branch pointed to by `HEAD`
diff --git a/tests/units/test_each_conflict.rb b/tests/units/test_each_conflict.rb
@@ -5,9 +5,10 @@
 class TestEachConflict < Test::Unit::TestCase
   def test_conflicts
     in_temp_repo('working') do
+      # Setup a repository with a conflict
       g = Git.open('.')
 
-      g.branch('new_branch').in_branch('test') do
+      g.branch('new_branch').in_branch('commit message') do
         new_file('example.txt', "1\n2\n3")
         g.add
         true
@@ -20,11 +21,17 @@ def test_conflicts
       end
 
       g.merge('new_branch')
+
       begin
         g.merge('new_branch2')
-      rescue StandardError
+      rescue Git::FailedError => e
+        assert_equal(1, e.result.status.exitstatus)
+        assert_match(/CONFLICT/, e.result.stdout)
       end
 
+      assert_equal(1, g.lib.unmerged.size)
+
+      # Check the conflict
       g.each_conflict do |file, your, their|
         assert_equal('example.txt', file)
         assert_equal("1\n2\n3\n", File.read(your))
