From 3167780cdeef6bb44939f021ab13b6cefc1aab37 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Thu, 30 Nov 2017 11:09:26 -0800
Subject: [PATCH] hack/patch: fix some typos in README, make cherrypick.sh
 executable

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
---
 hack/patch/README.md     | 9 +++++----
 hack/patch/cherrypick.sh | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 hack/patch/cherrypick.sh

diff --git a/hack/patch/README.md b/hack/patch/README.md
index 47cb24aeba3..4f8282e6a26 100644
--- a/hack/patch/README.md
+++ b/hack/patch/README.md
@@ -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.
 
@@ -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
 ```
 
 
diff --git a/hack/patch/cherrypick.sh b/hack/patch/cherrypick.sh
old mode 100644
new mode 100755
index faf1258b4b6..4faf3efa273
--- a/hack/patch/cherrypick.sh
+++ b/hack/patch/cherrypick.sh
@@ -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}"