@@ -176,6 +176,36 @@ OpenShift is checked into this repository.  To install `godep` locally run:

 If you are not updating packages you should not need godep installed.

+## Cherry-picking an upstream commit into Origin

+

+You can use `hack/cherry-pick.sh` to generate patches for Origin from upstream commits. To use

+this command, be sure to setup remote branches like https://gist.github.com/piscisaureus/3342247

+so that `git show origin/pr/<number>` displays information about your branch after a `git fetch`.

+You must also have the Kubernetes repository checked out in your GOPATH (visible as `../../../k8s.io/kubernetes`)

+and have no modified or uncommited files in either repository.

+

+To pull an upstream commit, run:

+

+    $ hack/cherry-pick.sh <pr_number>

+

+This will attempt to create a patch from the current Kube rebase version in Origin that contains

+the commits added in the PR. If the PR has already been merged to the Kube version, you'll get an

+error. If there are conflicts, you'll have to resolve them in the upstream repo, then hit ENTER

+to continue. The end result will be a single commit in your Origin repo that contains the changes.

+

+If you want to run without a rebase option, set `NO_REBASE=1` before the command is run. You can

+also specify a commit range directly with:

+

+    $ hack/cherry-pick.sh origin/master...<some_branch>

+

+All upstream commits should have a commit message where the first line is:

+

+    UPSTREAM: <PR number|drop|carry>: <short description>

+

+`drop` indicates the commit should be removed during the next rebase. `carry` means that the change

+cannot go into upstream, and we should continue to use it during the next rebase.

+

+

 ## Updating Kubernetes from upstream

 There are a few steps involved in rebasing Origin to a new version of Kubernetes. We need to make sure

new file mode 100755

@@ -0,0 +1,83 @@

+#!/bin/bash

+

+# See HACKING.md for usage

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+source "${OS_ROOT}/hack/common.sh"

+source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

+# Go to the top of the tree.

+cd "${OS_ROOT}"

+

+if [[ "$#" -ne 1 ]]; then

+  echo "You must supply a pull request by number or a Git range in the upstream Kube project" 1>&2

+  exit 1

+fi

+os::build::require_clean_tree # Origin tree must be clean

+

+patch="${TMPDIR}/patch"

+kubedir="../../../k8s.io/kubernetes"

+if [[ ! -d "${kubedir}" ]]; then

+  echo "Expected ${kubedir} to exist" 1>&2

+  exit 1

+fi

+

+if [[ -z "${NO_REBASE-}" ]]; then

+  lastkube="$(go run ${OS_ROOT}/hack/version.go ${OS_ROOT}/Godeps/Godeps.json k8s.io/kubernetes/pkg/api)"

+fi

+

+pushd "${kubedir}" > /dev/null

+os::build::require_clean_tree

+git fetch

+

+selector="$(os::build::commit_range $1 origin/master)"

+

+if [[ -z "${NO_REBASE-}" ]]; then

+  echo "++ Generating patch for ${selector} onto ${lastkube} ..." 2>&1

+  if git rev-parse kube_rebaser_branch > /dev/null 2>&1; then

+    git branch -d kube_rebaser_branch

+  fi

+  git checkout -b kube_rebaser_branch "${lastkube}"

+  git diff -p --raw "${selector}" > "${patch}"

+  if ! git apply -3 "${patch}"; then

+    git rerere # record pre state

+    echo 2>&1

+    echo "++ Merge conflicts when generating patch, please resolve conflicts and then press ENTER to continue" 1>&2

+    read

+  fi

+  git rerere # record post state

+  # stage any new files

+  git add . > /dev/null

+  # construct a new patch

+  git diff --cached -p --raw --{src,dst}-prefix=a/Godeps/_workspace/src/k8s.io/kubernetes/ > "${patch}"

+  # cleanup the current state

+  git reset HEAD --hard > /dev/null

+  git checkout master > /dev/null

+  git branch -d kube_rebaser_branch > /dev/null

+else

+  echo "++ Generating patch for ${selector} without rebasing ..." 2>&1

+  git diff -p --raw --{src,dst}-prefix=a/Godeps/_workspace/src/k8s.io/kubernetes/ "${selector}" > "${patch}"

+fi

+

+popd > /dev/null

+

+echo "++ Applying patch ..." 2>&1

+echo 2>&1

+set +e

+git apply --reject "${patch}"

+if [[ $? -ne 0 ]]; then

+  echo "++ Not all patches applied, merge *.req into your files or rerun with REBASE=1"

+  exit 1

+fi

+

+set -o errexit

+git add .

+git commit -m "UPSTREAM: $1: " > /dev/null

+git commit --amend

+echo 2>&1

+echo "++ Done" 2>&1

@@ -510,6 +510,46 @@ os::build::ldflags() {

   )

 }

+# os::build::require_clean_tree exits if the current Git tree is not clean.

+os::build::require_clean_tree() {

+  if ! git diff-index --quiet HEAD -- || test $(git ls-files --exclude-standard --others | wc -l) != 0; then

+    echo "You can't have any staged or dirty files in $(pwd) for this command."

+    echo "Either commit them or unstage them to continue."

+    exit 1

+  fi

+}

+

+# os::build::commit_range takes one or two arguments - if the first argument is an

+# integer, it is assumed to be a pull request and the local origin/pr/# branch is

+# used to determine the common range with the second argument. If the first argument

+# is not an integer, it is assumed to be a Git commit range and output directly.

+os::build::commit_range() {

+  if [[ "$1" =~ ^-?[0-9]+$ ]]; then

+    local target

+    target="$(git rev-parse origin/pr/$1)"

+    if [[ $? -ne 0 ]]; then

+      echo "Branch does not exist, or you have not configured origin/pr/* style branches from GitHub" 1>&2

+      exit 1

+    fi

+

+    local base

+    base="$(git merge-base origin/pr/$1 $2)"

+    if [[ $? -ne 0 ]]; then

+      echo "Branch has no common commits with $2" 1>&2

+      exit 1

+    fi

+    if [[ "${base}" == "${target}" ]]; then

+      echo "Branch has already been merged to upstream master, use explicit range instead" 1>&2

+      exit 1

+    fi

+

+    echo "${base}...${target}"

+    exit 0

+  fi

+

+  echo "$1"

+}

+

 os::build::gen-docs() {

   local cmd="$1"

   local dest="$2"