Commit 62982dfb authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Remove an unnecessary optimisation from squash.py

parent 84dbfe97
Loading
Loading
Loading
Loading
+3 −17
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import argparse
import os
import sys
from fnmatch import fnmatch
from pathlib import Path
from subprocess import PIPE
from subprocess import Popen
from textwrap import dedent
@@ -68,17 +67,6 @@ class CommitDict(DefaultDict[str, Commit]):
		return commit


def git_log_cmd() -> List[str]:
	"""
	Return the first arguments for running a git-log command
	"""
	if GIT_EXEC_PATH in os.environ:
		git_log = Path.cwd() / os.environ[GIT_EXEC_PATH] / 'git-log'
		if git_log.exists() and git_log.stat().st_mode & os.X_OK:
			return [git_log.as_posix()]
	return ['git', 'log']


def catalogue_commits() -> Generator[Commit, None, None]:
	"""
	Yield all regular commits as Commit objects, containing any update (squash) commits
@@ -86,12 +74,10 @@ def catalogue_commits() -> Generator[Commit, None, None]:
	if os.environ.get(PRE_COMMIT_FROM_REF, Z40) == Z40:
		return

	cmd = git_log_cmd()
	cmd.extend([
		'--reverse',
		'--format=format:%H %s',
	cmd = [
		'git', 'log', '--reverse', '--format=format:%H %s',
		f"{os.environ[PRE_COMMIT_FROM_REF]}...{os.environ[PRE_COMMIT_TO_REF]}",
	])
	]

	commits = CommitDict()