Commit Graph

13 Commits (68717ddae09f2801d27780e18a58a65303de225b)

Author SHA1 Message Date
Mike Danese f061875840 updating all references in .sh scripts 2015-08-12 14:41:59 -07:00
Dawn Chen 9af5d8bd23 Merge pull request #12305 from GoogleCloudPlatform/puller
Exit if hub isn't installed, add verbiage to message.
2015-08-06 16:08:30 -07:00
Mike Danese 8326697055 rewrite all links to prs to k8s links 2015-08-05 21:11:11 -07:00
Zach Loafman fccca8fa5d Exit if hub isn't installed, add verbiage to message. 2015-08-05 14:26:14 -07:00
Brendan Burns 70d843176b Add automated pull request creation. 2015-08-04 21:32:03 -07:00
Zach Loafman fb8613201b Fix hack/cherry_pick_pull.sh on OS X (sigh):
On OS X bash, for whatever reason, the ancient, forsaken bash version
(3.2!?) that will never be updated because it might insult the memory
of Steve Jobs doesn't allow me to accidentally escape the hash
character. Fix the unnecessary escaping.

For reviewers out there wondering about this syntax, it's documented
here: http://www.tldp.org/LDP/abs/html/parameter-substitution.html
under:

```
${var/#Pattern/Replacement}

  If prefix of var matches Pattern, then substitute Replacement for Pattern.
```

It just looks odd here because I'm adding the hash character to the
start of each array element.
2015-07-15 21:09:56 -07:00
Zach Loafman 4c078b1a99 hack/cherry_pick_pull.sh: Coach user on how to make a pull against non-master 2015-07-13 16:16:59 -07:00
Zach Loafman 180a38c181 hack/cherry_pick_pull.sh: Allow multiple pulls
Reorder the arguments to allow for multiple pulls at the end:
  hack/cherry_pick_pull.sh <remote branch> <pr-number>...

This solves some common A-then-immediate-A' cases that appear
frequently on head. (There's a workaround, but it's a hack.) Updates
the documentation.
2015-07-13 07:11:12 -07:00
Wojciech Tyczynski b33954c45e Merge pull request #10963 from thockin/cherrypick-fixes
Ignore untracked files in cherrypick
2015-07-09 11:28:11 +02:00
Zach Loafman 1d6db553b0 Fix two issues in cherry_pick_pull:
* Ignore errexit in trap handler
* Check for branch (since two people have complained now..)
2015-07-08 18:16:27 -07:00
Tim Hockin b61985ad87 Ignore untracked files in cherrypick 2015-07-08 17:09:14 -07:00
Zach Loafman 390bb58f48 Brendan noticed this silly inconsistency. 2015-07-08 11:53:33 -07:00
Zach Loafman 4f3accec00 Add cherry_pick_pull.sh <pr-number> <branch>
This script checks out a branch based on <branch>, cherry picks pull
request <pr> into it commit by commit, then instructs the user on how
to propose that branch as a PR to the branch.

For bonus points, this could be integrated with something like the
"hub" tool (https://github.com/github/hub) and be made about 2x more
automated.

Fixes #10730
2015-07-08 11:15:28 -07:00