From 20364a82157d2783a5673b2162bccfe79d8de5d0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 01 2015 11:46:00 +0000
Subject: Add a method to find the base revision between two commits


---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 318e8ca..6acd1b9 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -815,6 +815,14 @@ def is_forced_push(torev, fromrev, abspath):
     return len(out) > 0
 
 
+def get_base_revision(torev, fromrev, abspath):
+    """ Return the base revision between HEAD and BASE.
+    This is useful in case of force-push.
+    """
+    cmd = ['merge-base', fromrev, torev]
+    return pagure.lib.git.read_git_lines(cmd, abspath)
+
+
 def get_pusher(commit, abspath):
     ''' Return the name of the person that pushed the commit. '''
     user = pagure.lib.git.read_git_lines(