Fix Git::Base#status on an empty repo

jcouball · jcouball · commit c8a77db9a515 · 2024-05-15T20:10:02.000-07:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -707,6 +707,19 @@ def rm(path = '.', opts = {})
       command('rm', *arr_opts)
     end
 
+    # Returns true if the repository is empty (meaning it has no commits)
+    #
+    # @return [Boolean]
+    #
+    def empty?
+      command('rev-parse', '--verify', 'HEAD')
+      false
+    rescue Git::FailedError => e
+      raise unless e.result.status.exitstatus == 128 &&
+        e.result.stderr == 'fatal: Needed a single revision'
+      true
+    end
+
     # Takes the commit message with the options and executes the commit command
     #
     # accepts options:
diff --git a/lib/git/status.rb b/lib/git/status.rb
@@ -183,9 +183,11 @@ def fetch_modified
     end
 
     def fetch_added
-      # find added but not committed - new files
-      @base.lib.diff_index('HEAD').each do |path, data|
-        @files[path] ? @files[path].merge!(data) : @files[path] = data
+      unless @base.lib.empty?
+        # find added but not committed - new files
+        @base.lib.diff_index('HEAD').each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
       end
     end
   end
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -318,4 +318,25 @@ def test_compare_version_to
     assert lib.compare_version_to(2, 43, 0) == -1
     assert lib.compare_version_to(3, 0, 0) == -1
   end
+
+  def test_empty_when_not_empty
+    in_temp_dir do |path|
+      `git init`
+      `touch file1`
+      `git add file1`
+      `git commit -m "my commit message"`
+
+      git = Git.open('.')
+      assert_false(git.lib.empty?)
+    end
+  end
+
+  def test_empty_when_empty
+    in_temp_dir do |path|
+      `git init`
+
+      git = Git.open('.')
+      assert_true(git.lib.empty?)
+    end
+  end
 end
diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb
@@ -25,6 +25,16 @@ def test_status_pretty
     end
   end
 
+  def test_on_empty_repo
+    in_temp_dir do |path|
+      `git init`
+      git = Git.open('.')
+      assert_nothing_raised do
+        git.status
+      end
+    end
+  end
+
   def test_dot_files_status
     in_temp_dir do |path|
       git = Git.clone(@wdir, 'test_dot_files_status')
