@@ -136,7 +136,8 @@ def tracked?(path)
     #
     # @return [Array<String>] list of absolute file paths
     def all_files
-      deleted_files, tracked_files = [%w[git ls-files --deleted], %w[git ls-files]].map do |command|
+      deleted_files, tracked_files = [%w[git ls-files -z --deleted],
+                                      %w[git ls-files -z]].map do |command|
         result = Overcommit::Utils.execute(command)
         unless result.success?
           raise Overcommit::Exceptions::Error,
@@ -145,7 +146,7 @@ def all_files
                 "STDERR: #{result.stderr}."
         end
 
-        result.stdout.split(/\n/)
+        result.stdout.split("\0")
       end
 
       (tracked_files - deleted_files).
 
@@ -46,6 +46,20 @@
       (subject.stdout + subject.stderr).should include('Error listing files')
       subject.stdout.should_not include('All pre-commit hooks passed')
     end
+
+    ['café.rb', 'répertoire/test.rb', 'quote".rb', "tab\t.rb", "line\n.rb"].each do |path|
+      it "checks trailing whitespace in #{path.inspect} with Git path quoting enabled" do
+        if Overcommit::OS.windows? && path.match?(/["\t\n]/)
+          skip 'Windows filenames cannot contain quotes or control characters'
+        end
+
+        shell(%w[git config core.quotePath true]).status.should == 0
+        FileUtils.mkdir_p(File.dirname(path))
+        echo('puts :fixture ', path)
+        shell(['git', 'add', '--', path]).status.should == 0
+        subject.status.should == 65
+      end
+    end
   end
 
   context 'when using an existing pre-commit hook script' do
 
@@ -317,7 +317,7 @@
       before do
         result = Overcommit::Subprocess::Result.new(128, '', 'fatal')
         allow(Overcommit::Utils).to receive(:execute).and_call_original
-        allow(Overcommit::Utils).to receive(:execute).with(%w[git ls-files]).and_return(result)
+        allow(Overcommit::Utils).to receive(:execute).with(%w[git ls-files -z]).and_return(result)
       end
 
       it 'raises with the Git error' do
@@ -334,6 +334,51 @@
       it { should_not include File.expand_path('tracked') }
       it { should include File.expand_path('staged') }
     end
+
+    context 'when Git quotes tracked filenames' do
+      before { shell(%w[git config core.quotePath true]).status.should == 0 }
+
+      def stage_files(paths)
+        paths.each do |path|
+          FileUtils.mkdir_p(File.dirname(path))
+          touch(path)
+        end
+        shell(%w[git add --] + paths).status.should == 0
+      end
+
+      it 'preserves Unicode, nested Unicode, and space-containing paths' do
+        paths = ['café.rb', 'répertoire/test.rb', 'with spaces.rb']
+        stage_files(paths)
+        subject.should include(*paths.map { |path| File.expand_path(path) })
+      end
+
+      it 'preserves quotes, tabs, newlines, and surrounding whitespace' do
+        skip 'Windows filenames cannot contain quotes or control characters' if Overcommit::OS.windows?
+        paths = ['quote".rb', "tab\t.rb", "line\n.rb", ' padded.rb ']
+        stage_files(paths)
+        subject.should include(*paths.map { |path| File.expand_path(path) })
+      end
+
+      it 'excludes a deleted Unicode path' do
+        stage_files(['café.rb'])
+        FileUtils.rm('café.rb')
+        subject.should_not include(File.expand_path('café.rb'))
+      end
+
+      it 'excludes deleted paths containing quotes or control characters' do
+        skip 'Windows filenames cannot contain quotes or control characters' if Overcommit::OS.windows?
+        paths = ['quote".rb', "tab\t.rb", "line\n.rb"]
+        stage_files(paths)
+        FileUtils.rm(paths)
+        subject.should_not include(*paths.map { |path| File.expand_path(path) })
+      end
+
+      it 'retains a tracked broken symlink with a Unicode name' do
+        symlink('missing-target', 'café.rb')
+        shell(['git', 'add', '--', 'café.rb']).status.should == 0
+        subject.should include(File.expand_path('café.rb'))
+      end
+    end
   end
 
   describe '.initial_commit?' do