diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2015-11-08 20:22:57 -0500 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-08 20:22:57 -0500 |
commit | 252e2841c18ec0b8fadfa1758eb7ec3a4b67ff44 (patch) | |
tree | 5a42c0109283613294b75ad284835d6fb8b82885 | |
parent | 2aa4fee9b953454f31ac7dea9dd9d5b937323660 (diff) | |
download | stable-tools-252e2841c18ec0b8fadfa1758eb7ec3a4b67ff44.tar.gz |
stable-insert: add actual code
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rwxr-xr-x | stable-insert | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/stable-insert b/stable-insert new file mode 100755 index 0000000..b087679 --- /dev/null +++ b/stable-insert @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ $# -ne 2 ]; then + echo "Usage: stable insert <before sha1> <commit sha1>" + exit 1 +fi + +before=$1 +after=$(git rev-parse $before^) +curhead=$(git rev-parse HEAD) + +git reset --hard $after +git cherry-pick $2 +if [ $? -gt 0 ]; then + echo "Pick failed: fix, commit and exit" + /bin/sh +else + stable make-pretty $2 +fi +git cherry-pick $after..$curhead |