Skip to content

Commit

Permalink
hack/patch: fix some typos in README, make cherrypick.sh executable
Browse files Browse the repository at this point in the history
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
  • Loading branch information
gyuho committed Nov 30, 2017
1 parent 66a9508 commit 3167780
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions hack/patch/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# hack/cherrypick.sh
# ./hack/patch/cherrypick.sh

Handles cherry-picks of PR(s) from etcd master to a stable etcd release branch automatically.

Expand All @@ -15,22 +15,23 @@ one on github.com and register it locally with `git remote add ...`.
```
export UPSTREAM_REMOTE=origin
export FORK_REMOTE=${github-username}
export GITHUB_USER=${github-username}
```

Next, install hub from https://github.com/github/hub

## Usage

To cherry pick PR 12345 onto release-2.22 and propose is as a PR, run:
To cherry pick PR 12345 onto release-3.2 and propose is as a PR, run:

```sh
hack/cherrypick.sh upstream/release-2.2 12345
./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345
```

To cherry pick 12345 then 56789 and propose them togther as a single PR, run:

```
hack/cherrypick.sh upstream/release-2.2 12345 56789
./hack/patch/cherrypick.sh ${UPSTREAM_REMOTE}/release-3.2 12345 56789
```


2 changes: 1 addition & 1 deletion hack/patch/cherrypick.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Cherry pick of ${PULLSUBJ} on ${rel}.
$(printf '%s\n' "${SUBJECTS[@]}")
EOF

hub pull-request -F "${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "etcd:${rel}"
hub pull-request -F "${prtext}" -h "${GITHUB_USER}:${NEWBRANCH}" -b "coreos:${rel}"
}

git checkout -b "${NEWBRANCHUNIQ}" "${BRANCH}"
Expand Down

0 comments on commit 3167780

Please sign in to comment.