fix: fix Rubocop Style/IfUnlessModifier offense

jcouball · jcouball · commit c97483239e64 · 2025-07-03T16:10:33.000-07:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -6,13 +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: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/git/base.rb'
-    - 'lib/git/lib.rb'
-
 # Offense count: 2
 Style/MultilineBlockChain:
   Exclude:
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -865,9 +865,7 @@ def diff_path_status(objectish = 'HEAD', obj2 = nil)
           File.expand_path(options[:repository] || '.git', options[:working_directory])
         end
 
-      if File.file?(repository)
-        repository = File.expand_path(File.read(repository)[8..].strip, options[:working_directory])
-      end
+      repository = File.expand_path(File.read(repository)[8..].strip, options[:working_directory]) if File.file?(repository)
 
       options[:repository] = repository
     end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -1300,9 +1300,7 @@ def tag(name, *opts)
 
       opts = opts.last.instance_of?(Hash) ? opts.last : {}
 
-      if (opts[:a] || opts[:annotate]) && !(opts[:m] || opts[:message])
-        raise ArgumentError, 'Cannot create an annotated tag without a message.'
-      end
+      raise ArgumentError, 'Cannot create an annotated tag without a message.' if (opts[:a] || opts[:annotate]) && !(opts[:m] || opts[:message])
 
       arr_opts = []
 
@@ -1520,9 +1518,7 @@ def self.warn_if_old_command(lib) # rubocop:disable Naming/PredicateMethod
       return true if @version_checked
 
       @version_checked = true
-      unless lib.meets_required_version?
-        warn "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
-      end
+      warn "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade." unless lib.meets_required_version?
       true
     end
 
@@ -1668,9 +1664,7 @@ def diff_as_hash(diff_command, opts = [])
     def log_common_options(opts)
       arr_opts = []
 
-      if opts[:count] && !opts[:count].is_a?(Integer)
-        raise ArgumentError, "The log count option must be an Integer but was #{opts[:count].inspect}"
-      end
+      raise ArgumentError, "The log count option must be an Integer but was #{opts[:count].inspect}" if opts[:count] && !opts[:count].is_a?(Integer)
 
       arr_opts << "--max-count=#{opts[:count]}" if opts[:count]
       arr_opts << '--all' if opts[:all]
