Class: Overcommit::Hook::PreCommit::MergeConflicts

Inherits:
Base
  • Object
show all
Defined in:
lib/overcommit/hook/pre_commit/merge_conflicts.rb

Overview

Checks for unresolved merge conflicts

Instance Method Summary collapse

Methods inherited from Base

#applicable_files, #description, #enabled?, #execute, #in_path?, #initialize, #name, #quiet?, #required?, #run?, #skip?

Constructor Details

This class inherits a constructor from Overcommit::Hook::Base

Instance Method Details

#run ⇒ Object 



4
5
6
7
8
9
10
11
12
 
# File 'lib/overcommit/hook/pre_commit/merge_conflicts.rb', line 4

def run
  result = execute(%w[grep -IHn ^<<<<<<<\s] + applicable_files)

  unless result.stdout.empty?
    return :bad, "Merge conflict markers detected:\n#{result.stdout}"
  end

  :good
end