Skip to content

Commit

Permalink
Merge pull request #714 from jiridanek/jd_useful_error
Browse files Browse the repository at this point in the history
Issue #713: fix(gha): don't crash when branch name matches file name in the repo
  • Loading branch information
openshift-merge-bot[bot] authored Sep 26, 2024
2 parents 22e395c + c2e54f0 commit 48d5c50
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ci/cached-builds/gha_pr_changed_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ def get_github_token() -> str:
def list_changed_files(from_ref: str, to_ref: str) -> list[str]:
logging.debug("Getting list of changed files from git diff")

files = subprocess.check_output(["git", "diff", "--name-only", from_ref, to_ref],
# https://github.com/red-hat-data-services/notebooks/pull/361: add -- in case to_ref matches a file name in the repo
files = subprocess.check_output(["git", "diff", "--name-only", from_ref, to_ref, '--'],
encoding='utf-8').splitlines()

logging.debug(f"Determined {len(files)} changed files: {files[:100]} (..., printing up to 100 files)")
Expand Down

0 comments on commit 48d5c50

Please sign in to comment.