From 5d86332153838252384f9f87a0ae3e34c46eb266 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 25 Feb 2015 15:12:19 +0100
Subject: Send EmailsOnPush when deleting commits using force push.

See #1924.
---
 app/workers/emails_on_push_worker.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'app/workers')

diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index 309772cb5ce..2e783814824 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -15,8 +15,15 @@ class EmailsOnPushWorker
 
     compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha)
 
-    # Do not send emails if git compare failed
-    return false unless compare && compare.commits.present?
+    return false if compare.same
+
+    if compare.commits.empty?
+      compare = Gitlab::Git::Compare.new(project.repository.raw_repository, after_sha, before_sha)
+
+      reverse_compare = true
+
+      return false if compare.commits.empty?
+    end
 
     recipients.split(" ").each do |recipient|
       Notify.repository_push_email(
@@ -25,6 +32,7 @@ class EmailsOnPushWorker
         author_id, 
         branch, 
         compare, 
+        reverse_compare,
         send_from_committer_email,
         disable_diffs
       ).deliver
-- 
cgit v1.2.3