Merge pull request #10 from Shopify/detect-conflict

Detect conflict

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb
index 83e1078..25b2cd0 100644
--- a/lib/oxidized/hook/githubrepo.rb
+++ b/lib/oxidized/hook/githubrepo.rb
@@ -16,12 +16,14 @@ class GithubRepo < Oxidized::Hook
   end
 
   def fetch_and_merge_remote(repo, credentials)
-    their_branch = repo.branches["origin/master"] or return
-
     repo.fetch('origin', [repo.head.name], credentials: credentials)
 
+    their_branch = repo.branches["origin/master"] or return
+
     merge_index = repo.merge_commits(repo.head.target_id, their_branch.target_id)
 
+    log("Conflicts detected", :warn) if merge_index.conflicts?
+
     Rugged::Commit.create(repo, {
       parents: [repo.head.target, their_branch.target],
       tree: merge_index.write_tree(repo),
diff --git a/spec/githubrepo_spec.rb b/spec/githubrepo_spec.rb
index 9b509e4..07296f3 100644
--- a/spec/githubrepo_spec.rb
+++ b/spec/githubrepo_spec.rb
@@ -18,8 +18,9 @@ describe Oxidized::Node do
     repo.expects(:remotes).returns({'origin' => remote})
     repo.expects(:path).returns('foo.git')
     repo_head = mock()
-    repo_head.expects(:name).returns('origin/master')
-    repo.expects(:head).returns(repo_head)
+    repo_head.expects(:name).twice.returns('origin/master')
+    repo.expects(:head).twice.returns(repo_head)
+    repo.expects(:fetch).returns(true)
     repo.expects(:branches).returns({})
     Rugged::Repository.expects(:new).with('foo.git').returns(repo)
   end