Fix Git::Status#untracked when run from worktree subdir

jcouball · jcouball · commit 712fdaddc113 · 2024-05-15T19:11:47.000-07:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -600,6 +600,9 @@ def ignored_files
       command_lines('ls-files', '--others', '-i', '--exclude-standard')
     end
 
+    def untracked_files
+      command_lines('ls-files', '--others', '--exclude-standard', chdir: @git_work_dir)
+    end
 
     def config_remote(name)
       hsh = {}
diff --git a/lib/git/status.rb b/lib/git/status.rb
@@ -170,13 +170,7 @@ def construct_status
     end
 
     def fetch_untracked
-      ignore = @base.lib.ignored_files
-
-      root_dir = @base.dir.path
-      Dir.glob('**/*', File::FNM_DOTMATCH, base: root_dir) do |file|
-        next if @files[file] || File.directory?(File.join(root_dir, file)) ||
-                ignore.include?(file) || file =~ %r{^.git\/.+}
-
+      @base.lib.untracked_files.each do |file|
         @files[file] = { path: file, untracked: true }
       end
     end
diff --git a/tests/units/test_status.rb b/tests/units/test_status.rb
@@ -87,6 +87,56 @@ def test_deleted_boolean
     end
   end
 
+  def test_untracked
+    in_temp_dir do |path|
+      `git init`
+      File.write('file1', 'contents1')
+      File.write('file2', 'contents2')
+      Dir.mkdir('subdir')
+      File.write('subdir/file3', 'contents3')
+      File.write('subdir/file4', 'contents4')
+      `git add file1 subdir/file3`
+      `git commit -m "my message"`
+
+      git = Git.open('.')
+      assert_equal(2, git.status.untracked.size)
+      assert_equal(['file2', 'subdir/file4'], git.status.untracked.keys)
+    end
+  end
+
+  def test_untracked_no_untracked_files
+    in_temp_dir do |path|
+      `git init`
+      File.write('file1', 'contents1')
+      Dir.mkdir('subdir')
+      File.write('subdir/file3', 'contents3')
+      `git add file1 subdir/file3`
+      `git commit -m "my message"`
+
+      git = Git.open('.')
+      assert_equal(0, git.status.untracked.size)
+    end
+  end
+
+  def test_untracked_from_subdir
+    in_temp_dir do |path|
+      `git init`
+      File.write('file1', 'contents1')
+      File.write('file2', 'contents2')
+      Dir.mkdir('subdir')
+      File.write('subdir/file3', 'contents3')
+      File.write('subdir/file4', 'contents4')
+      `git add file1 subdir/file3`
+      `git commit -m "my message"`
+
+      Dir.chdir('subdir') do
+        git = Git.open('..')
+        assert_equal(2, git.status.untracked.size)
+        assert_equal(['file2', 'subdir/file4'], git.status.untracked.keys)
+      end
+    end
+  end
+
   def test_untracked_boolean
     in_temp_dir do |path|
       git = Git.clone(@wdir, 'test_dot_files_status')
