diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-06 10:32:13 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-06 15:51:37 +0100 |
commit | e399c4a15d59fba66838fa1a17e306ab14470fcc (patch) | |
tree | e5c3db585d9d903a9ed14ab88ecffd752855d2a4 /bin | |
parent | 99569a9991b0242071b7618b7682399ca1ed1737 (diff) | |
download | qtjsbackend-e399c4a15d59fba66838fa1a17e306ab14470fcc.tar.gz |
Added helper script for cherry-picking commits from v8
Change-Id: I563302b9d5c83e6497d89550657c7d17f0ba7bc3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/cherry-pick-from-v8.sh | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/bin/cherry-pick-from-v8.sh b/bin/cherry-pick-from-v8.sh new file mode 100755 index 0000000..069d37c --- /dev/null +++ b/bin/cherry-pick-from-v8.sh @@ -0,0 +1,63 @@ +#!/bin/bash +############################################################################# +## +## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is the build configuration utility of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## GNU Lesser General Public License Usage +## This file may be used under the terms of the GNU Lesser General Public +## License version 2.1 as published by the Free Software Foundation and +## appearing in the file LICENSE.LGPL included in the packaging of this +## file. Please review the following information to ensure the GNU Lesser +## General Public License version 2.1 requirements will be met: +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU General +## Public License version 3.0 as published by the Free Software Foundation +## and appearing in the file LICENSE.GPL included in the packaging of this +## file. Please review the following information to ensure the GNU General +## Public License version 3.0 requirements will be met: +## http://www.gnu.org/copyleft/gpl.html. +## +## Other Usage +## Alternatively, this file may be used in accordance with the terms and +## conditions contained in a signed written agreement between you and Nokia. +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +v8repo=https://github.com/v8/v8.git + +if [ "$#" != 1 ]; then + echo "usage: $0 <commit>" + exit 1 +fi + +commit=$1 +git cat-file -e $commit +if [ $? != 0 ]; then + echo "Cannot find commit $commit . Trying to fetch it from the master branch at $v8repo." + git fetch $v8repo master + git cat-file -e $commit + if [ $? != 0 ]; then + echo "I still cannot find that commit, not even in the master branch. Please run git fetch yourself" + echo "with the appropriate parameters to get the commit you'd like to cherry-pick into this repo." + exit 1 + fi +fi + +((git format-patch -M -C --relative --stdout "$commit^..$commit" ) | git am -s -3 --directory=src/3rdparty/v8) && git commit --amend |