diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 9bf26bd1..cfbb8a82 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -328,6 +328,8 @@ if __name__ == '__main__':
         # Check if change is already picked to HEAD...HEAD~check_picked_count
         found_change = False
         for i in range(0, check_picked_count):
+            if subprocess.call(['git', 'cat-file', '-e', 'HEAD~{0}'.format(i)], cwd=project_path, stderr=open(os.devnull, 'wb')):
+                continue
             output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split()
             if 'Change-Id:' in output:
                 head_change_id = ''