summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-05-01 16:18:51 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-01 16:18:51 -0400
commit919c030ae047755d0b6109dca548f789ce24fbbf (patch)
treebe33788bf3834ec2e1117828953835956993422b
parentcfeccb841ed9b064080021e14d8f5e268760cbf9 (diff)
add script to simplify picking patches for stable releases
-rwxr-xr-xrelease-picker.sh23
1 files changed, 23 insertions, 0 deletions
diff --git a/release-picker.sh b/release-picker.sh
new file mode 100755
index 0000000..6ed6b37
--- /dev/null
+++ b/release-picker.sh
@@ -0,0 +1,23 @@
1#!/bin/zsh -e
2
3commit_num=$1
4
5echo "Starting at origin/master~${commit_num}..."
6
7for x in {$commit_num..0} ; do
8 echo "Checking origin/master~$x"
9 git show origin/master~$x
10 echo "Pick? (y/n)"
11 read -sk pick
12 if [[ "${pick:0:1}" = "y" ]] ; then
13 git cherry-pick origin/master~$x
14 if [[ $? != 0 ]] ; then
15 echo "BAILing at origin/master~$x for conflict merge; resume at $(($x-1))"
16 break
17 fi
18 else
19 echo
20 fi
21done
22
23echo "Done!"