commit c05b54f806a0283a022284fdf571bba8884b742f
author Sam Saccone <samccone@google.com> Fri Jul 10 18:37:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 10 18:37:30 2020 +0000
tree c23cde41453e9697481fe3452b8d791da9bfba38
parent e1dae1acecfba8dfe375a2ae0097876aa663f56f
parent c2fc52cc787edef0ef1818726b9bf656b894b894

Migrate from blame to history scoped blame am: adef809ab8 am: c2fc52cc78

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/checkstyle/+/12129282

Change-Id: I5daf7c6f3c230f2c94afbc72cb62b1976bc1d2ae

gitlint/git.py

diff --git a/gitlint/git.py b/gitlint/git.py
index 9d796f6..e55aa06 100644
--- a/gitlint/git.py
+++ b/gitlint/git.py
@@ -126,7 +126,7 @@
 
     # Split as bytes, as the output may have some non unicode characters.
     blame_lines = subprocess.check_output(
-        ['git', 'blame', commit, '--porcelain', '--', filename]).split(
+        ['git', 'blame', (commit + '^!'), '--porcelain', '--', filename]).split(
             os.linesep.encode('utf-8'))
     modified_line_numbers = utils.filter_lines(
         blame_lines,