Skip to content

Commit 5e4f882

Browse files
authored
[automerge] Avoid reading newlines from .automergeignore file (#23)
1 parent d773bfb commit 5e4f882

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arm-software/ci/automerge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def main():
185185
git_repo = Git(args.repo_path)
186186

187187
with open(MERGE_IGNORE_PATHSPEC_FILE) as ignored_paths_file:
188-
ignored_paths = ignored_paths_file.readlines()
188+
ignored_paths = ignored_paths_file.read().splitlines()
189189

190190
merge_commits = get_merge_commit_list(git_repo, args.from_branch, args.to_branch)
191191
for commit_hash in merge_commits:

0 commit comments

Comments
 (0)