Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit 6e8b64d

Browse files
author
edunham
committed
documentation and tidying
1 parent 32a1b07 commit 6e8b64d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Github hooks to provide an encouraging atmosphere for new contributors
66
Install
77
=======
88

9-
To install `highfive` you just need to execute the `setup.py` script or use `pip` directly. Both commands have to be executed from the directory where the `setup.py` script is located.
9+
To install `highfive` you just need to execute the `setup.py` script or use
10+
`pip` directly. Both commands have to be executed from the directory where the
11+
`setup.py` script is located.
1012

1113
$ python setup.py install
1214

@@ -62,8 +64,8 @@ present, the [Rust contributing.md][rustcontrib] will be linked instead.
6264

6365
If PRs should be filed against a branch other than `master`, specify the
6466
correct destination in the `expected_branch` field. If `expected_branch` is
65-
left out, highfive will assume that PRs should be filed against `master` and
66-
post a warning if they're against some other branch.
67+
left out, highfive will assume that PRs should be filed against `master`.
68+
The bot posts a warning on any PR that targets an unexpected branch.
6769

6870
[rustcontrib]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
6971

highfive/newpr.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,9 @@ def modifies_submodule(diff):
291291
return False
292292

293293
def unexpected_branch(payload, config):
294-
# Does the target branch of the PR (from payload) differ from the expected
295-
# branch in the config? If unspecified, assume master.
294+
""" returns (expected_branch, actual_branch) if they differ, else None
295+
"""
296+
# If unspecified, assume master.
296297
expected_target = config["expected_branch"]
297298
if not expected_target:
298299
expected_target = "master"

0 commit comments

Comments
 (0)