diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index 2c60e86..cfae856 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -393,7 +393,8 @@
 
         # Determine the maximum commits to check already picked changes
         check_picked_count = args.check_picked
-        branch_commits_count = int(subprocess.check_output(['git', 'rev-list', '--count', 'HEAD'], cwd=project_path))
+        max_count = '--max-count={0}'.format(check_picked_count + 1)
+        branch_commits_count = int(subprocess.check_output(['git', 'rev-list', '--count', max_count, 'HEAD'], cwd=project_path))
         if branch_commits_count <= check_picked_count:
             check_picked_count = branch_commits_count - 1