[28583] in Source-Commits
build-system commit: Remove weird hack with merge base detection
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Fri Mar 11 17:37:48 2016
Date: Fri, 11 Mar 2016 17:37:34 -0500
From: Victor Vasiliev <vasilvv@mit.edu>
Message-Id: <201603112237.u2BMbYLr028445@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/build-system/commit/ba170caeab2d4236398b4ee08170c2130d3296b9
commit ba170caeab2d4236398b4ee08170c2130d3296b9
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Fri Mar 11 17:29:34 2016 -0500
Remove weird hack with merge base detection
dabuildsys/git.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dabuildsys/git.py b/dabuildsys/git.py
index bf5f775..9d130ea 100644
--- a/dabuildsys/git.py
+++ b/dabuildsys/git.py
@@ -76,8 +76,7 @@ class GitRepository(object):
in case if two revisions are equal."""
try:
- self.git('merge-base', '--is-ancestor', rev_older, rev_newer)
- return True
+ return self.git('merge-base', rev_older, rev_newer) == rev_older
except subprocess.CalledProcessError as err:
if err.returncode == 1:
return False
