Restore modified times for both staged and unstaged files

Author: jawshooah

lib/overcommit/hook_context/pre_commit.rb

@@ -170,7 +170,10 @@ def initial_commit?
     def store_modified_times
       @modified_times = {}
 
-      modified_files.each do |file|
+      staged_files = modified_files
+      unstaged_files = Overcommit::GitRepo.modified_files(staged: false)
+
+      (staged_files + unstaged_files).each do |file|
         next if Overcommit::Utils.broken_symlink?(file)
         @modified_times[file] = File.mtime(file)
       end
@@ -179,10 +182,9 @@ def store_modified_times
     # Restores the file modification times for all modified files to make it
     # appear like they never changed.
     def restore_modified_times
-      modified_files.each do |file|
+      @modified_times.each do |file, time|
         next if Overcommit::Utils.broken_symlink?(file)
         next unless File.exist?(file)
-        time = @modified_times[file]
         File.utime(time, time, file)
       end
     end

spec/overcommit/hook_context/pre_commit_spec.rb

@@ -71,9 +71,11 @@
       around do |example|
         repo do
           `echo "Hello World" > tracked-file`
-          `git add tracked-file`
-          `git commit -m "Add tracked-file"`
+          `echo "Hello Other World" > other-tracked-file`
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
           `echo "Hello Again" > untracked-file`
+          `echo "Some more text" >> other-tracked-file`
           example.run
         end
       end
@@ -83,25 +85,38 @@
         File.open('tracked-file', 'r').read.should == "Hello World\n"
       end
 
+      it 'does not keep unstaged changes' do
+        subject
+        File.open('other-tracked-file', 'r').read.should == "Hello Other World\n"
+      end
+
       it 'keeps untracked files' do
         subject
         File.open('untracked-file', 'r').read.should == "Hello Again\n"
       end
 
       it 'keeps modification times the same' do
-        expect { subject }.
-          to_not change { [File.mtime('tracked-file'), File.mtime('untracked-file')] }
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
       end
     end
 
     context 'when there are staged changes' do
       around do |example|
         repo do
           `echo "Hello World" > tracked-file`
-          `git add tracked-file`
-          `git commit -m "Add tracked-file"`
+          `echo "Hello Other World" > other-tracked-file`
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
           `echo "Hello Again" > untracked-file`
           `echo "Some more text" >> tracked-file`
+          `echo "Some more text" >> other-tracked-file`
           `git add tracked-file`
           `echo "Yet some more text" >> tracked-file`
           example.run
@@ -110,7 +125,12 @@
 
       it 'keeps staged changes' do
         subject
-        `git show :tracked-file`.should == "Hello World\nSome more text\n"
+        File.open('tracked-file', 'r').read.should == "Hello World\nSome more text\n"
+      end
+
+      it 'does not keep unstaged changes' do
+        subject
+        File.open('other-tracked-file', 'r').read.should == "Hello Other World\n"
       end
 
       it 'keeps untracked files' do
@@ -119,8 +139,14 @@
       end
 
       it 'keeps modification times the same' do
-        expect { subject }.
-          to_not change { [File.mtime('tracked-file'), File.mtime('untracked-file')] }
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
       end
     end
 
@@ -202,19 +228,27 @@
       end
 
       it 'keeps modification times the same' do
-        expect { subject }.
-          to_not change { [File.mtime('tracked-file'), File.mtime('untracked-file')] }
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
       end
     end
 
     context 'when there were staged changes' do
       around do |example|
         repo do
           `echo "Hello World" > tracked-file`
-          `git add tracked-file`
-          `git commit -m "Add tracked-file"`
+          `echo "Hello Other World" > other-tracked-file`
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
           `echo "Hello Again" > untracked-file`
           `echo "Some more text" >> tracked-file`
+          `echo "Some more text" >> other-tracked-file`
           `git add tracked-file`
           `echo "Yet some more text" >> tracked-file`
           example.run
@@ -238,8 +272,14 @@
       end
 
       it 'keeps modification times the same' do
-        expect { subject }.
-          to_not change { [File.mtime('tracked-file'), File.mtime('untracked-file')] }
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
       end
     end