aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2016-06-21 09:32:33 -0400
committerSasha Levin <sasha.levin@oracle.com>2016-06-21 09:32:33 -0400
commit6beb2ae2620e66aa5357332fd7c824e505180455 (patch)
tree3f7f61c7167b3be2ea57df65c08663a21413945e
parent54342d9960d1bb2fd87198648f25fcc7fb471927 (diff)
downloadstable-tools-6beb2ae2620e66aa5357332fd7c824e505180455.tar.gz
stable-steal-commits: increase deps depth
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rwxr-xr-xstable-steal-commits5
1 files changed, 3 insertions, 2 deletions
diff --git a/stable-steal-commits b/stable-steal-commits
index 0fbab03..3c8bf49 100755
--- a/stable-steal-commits
+++ b/stable-steal-commits
@@ -35,7 +35,8 @@ function pick_one {
}
function do_one {
- for i in $(git log --no-merges --format="%H" --grep 'stable@vger' $1 $2 | tac); do
+# for i in $(git log --no-merges --format="%H" --grep 'stable@vger' $1 $2 | tac); do
+ for i in $(git log --no-merges --format="%H" $1 $2 | tac); do
subj=$(git log -1 --format="%s" $i)
# Let's grab the mainline commit id, this is useful if the version tag
@@ -60,7 +61,7 @@ function do_one {
continue
fi
echo "Cherry pick failed. Fix, commit (or reset) and exit."
- stable deps $i 10
+ stable deps $i 20
/bin/bash
continue
fi