Include modifications from last commit if amending

Author: jawshooah

Diff for: lib/overcommit/hook_context/pre_commit.rb

@@ -9,17 +9,26 @@ module Overcommit::HookContext
   # hooks only inspect staged changes.
   class PreCommit < Base # rubocop:disable ClassLength
     # Returns whether this hook run was triggered by `git commit --amend`
-    def amend?
-      if @amended.nil?
-        cmd = Overcommit::Utils.parent_command
-        @amended = !(/--amend/ =~ cmd).nil?
-
-        amend_alias = `git config --get-regexp '^alias\\.' '--amend'`.
-          slice(/(?<=alias\.)\w+/)
+    def amendment?
+      return @amendment unless @amendment.nil?
+
+      cmd = Overcommit::Utils.parent_command
+      amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
+
+      return @amendment if
+        # True if the command is a commit with the --amend flag
+        @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
+
+      # Check for git aliases that call `commit --amend`
+      `git config --get-regexp '^alias\\.' '#{amend_pattern}'`.
+        scan(/alias\.([-\w]+)/). # Extract the alias
+        each do |match|
+          return @amendment if
+            # True if the command uses a git alias for `commit --amend`
+            @amendment = !(/git\s+#{match[0]}/ =~ cmd).nil?
+        end
 
-        @amended ||= !(/git #{amend_alias}/ =~ cmd).nil? unless amend_alias.nil?
-      end
-      @amended
+      @amendment
     end
 
     # Stash unstaged contents of files so hooks don't see changes that aren't
@@ -78,7 +87,16 @@ def cleanup_environment
     # Get a list of added, copied, or modified files that have been staged.
     # Renames and deletions are ignored, since there should be nothing to check.
     def modified_files
-      @modified_files ||= Overcommit::GitRepo.modified_files(staged: true)
+      unless @modified_files
+        @modified_files = Overcommit::GitRepo.modified_files(staged: true)
+
+        # Include files modified in last commit if amending
+        if amendment?
+          subcmd = 'show --format=%n'
+          @modified_files += Overcommit::GitRepo.modified_files(subcmd: subcmd)
+        end
+      end
+      @modified_files
     end
 
     # @deprecated
@@ -92,8 +110,18 @@ def modified_lines(file)
     # changed in a specified file.
     def modified_lines_in_file(file)
       @modified_lines ||= {}
-      @modified_lines[file] ||=
-        Overcommit::GitRepo.extract_modified_lines(file, staged: true)
+      unless @modified_lines[file]
+        @modified_lines[file] =
+          Overcommit::GitRepo.extract_modified_lines(file, staged: true)
+
+        # Include lines modified in last commit if amending
+        if amendment?
+          subcmd = 'show --format=%n'
+          @modified_lines[file] +=
+            Overcommit::GitRepo.extract_modified_lines(file, subcmd: subcmd)
+        end
+      end
+      @modified_lines[file]
     end
 
     private

Diff for: spec/overcommit/hook_context/pre_commit_spec.rb

@@ -7,13 +7,15 @@
   let(:input) { double('input') }
   let(:context) { described_class.new(config, args, input) }
 
-  describe '#amend?' do
-    subject { context.amend? }
+  describe '#amendment?' do
+    subject { context.amendment? }
+
+    before do
+      Overcommit::Utils.stub(:parent_command).and_return(command)
+    end
 
     context 'when amending a commit using `git commit --amend`' do
-      before do
-        Overcommit::Utils.stub(:parent_command).and_return('git commit --amend')
-      end
+      let(:command) { 'git commit --amend' }
 
       it { should == true }
     end
@@ -22,23 +24,43 @@
       around do |example|
         repo do
           `git config alias.amend 'commit --amend'`
+          `git config alias.other-amend 'commit --amend'`
           example.run
         end
       end
 
-      before do
-        Overcommit::Utils.stub(:parent_command).and_return('git amend')
+      context 'when using one of multiple aliases' do
+        let(:command) { 'git amend' }
+
+        it { should == true }
       end
 
-      it { should == true }
+      context 'when using another of multiple aliases' do
+        let(:command) { 'git other-amend' }
+
+        it { should == true }
+      end
     end
 
     context 'when not amending a commit' do
-      before do
-        Overcommit::Utils.stub(:parent_command).and_return('git commit')
+      context 'using `git commit`' do
+        let(:command) { 'git commit' }
+
+        it { should == false }
       end
 
-      it { should == false }
+      context 'using a git alias containing "--amend"' do
+        let(:command) { 'git no--amend' }
+
+        around do |example|
+          repo do
+            `git config alias.no--amend commit`
+            example.run
+          end
+        end
+
+        it { should == false }
+      end
     end
   end
 
@@ -296,6 +318,10 @@
   describe '#modified_files' do
     subject { context.modified_files }
 
+    before do
+      context.stub(:amendment?).and_return(false)
+    end
+
     it 'does not include submodules' do
       submodule = repo do
         `touch foo`
@@ -359,5 +385,80 @@
 
       it { should be_empty }
     end
+
+    context 'when amending last commit' do
+      around do |example|
+        repo do
+          FileUtils.touch('some-file')
+          `git add some-file`
+          `git commit -m 'Initial commit'`
+          FileUtils.touch('other-file')
+          `git add other-file`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it { should =~ [File.expand_path('some-file'), File.expand_path('other-file')] }
+    end
+  end
+
+  describe '#modified_lines_in_file' do
+    let(:modified_file) { 'some-file' }
+    subject { context.modified_lines_in_file(modified_file) }
+
+    before do
+      context.stub(:amendment?).and_return(false)
+    end
+
+    context 'when file contains a trailing newline' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+
+    context 'when file does not contain a trailing newline' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') do |f|
+            (1..2).each { |i| f.write("#{i}\n") }
+            f.write(3)
+          end
+
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+
+    context 'when amending last commit' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
+          `git add #{modified_file}`
+          `git commit -m "Add files"`
+          File.open(modified_file, 'a') { |f| f.puts 4 }
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it { should == Set.new(1..4) }
+    end
   end
 end