mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 01:39:18 +02:00
./update-core.sh accepts tags as well as branches (#2583)
* ./update-core.sh accepts tags as well as branches * stop update.core.sh on all errors
This commit is contained in:
parent
aaca1ea264
commit
5df31105ce
1 changed files with 11 additions and 11 deletions
|
@ -1,29 +1,29 @@
|
|||
set -e # stop on all errors
|
||||
|
||||
git submodule update --init --recursive
|
||||
cd jni/deltachat-core-rust
|
||||
OLD=`git branch --show-current`
|
||||
if [ $# -eq 0 ]; then
|
||||
echo "updates deltachat-core-rust submodule to last commit of a branch."
|
||||
echo "usage: ./scripts/update-core.sh BRANCH_NAME"
|
||||
echo "updates deltachat-core-rust submodule to a tag or to last commit of a branch."
|
||||
echo "usage: ./scripts/update-core.sh BRANCH_OR_TAG"
|
||||
echo "current branch: $OLD"
|
||||
exit
|
||||
fi
|
||||
BRANCH=$1
|
||||
|
||||
NEW=$1
|
||||
|
||||
git fetch
|
||||
git checkout $BRANCH
|
||||
git checkout $NEW
|
||||
TEST=`git branch --show-current`
|
||||
if [ "$TEST" != "$BRANCH" ]; then
|
||||
echo "cannot select branch: $BRANCH"
|
||||
exit
|
||||
if [ "$TEST" == "$NEW" ]; then
|
||||
git pull
|
||||
fi
|
||||
git pull
|
||||
|
||||
commitmsg=`git log -1 --pretty=%s`
|
||||
cd ../..
|
||||
|
||||
|
||||
git add jni/deltachat-core-rust
|
||||
git commit -m "update deltachat-core-rust to '$commitmsg' of branch '$BRANCH'"
|
||||
echo "old branch: $OLD, new branch: $BRANCH"
|
||||
git commit -m "update deltachat-core-rust to '$commitmsg' of '$NEW'"
|
||||
echo "old: $OLD, new: $NEW"
|
||||
echo "changes are committed to local repo."
|
||||
echo "use 'git push' to use them or 'git reset HEAD~1; git submodule update --recursive' to abort."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue