mirror of
https://github.com/DynamoRIO/dynamorio.git
synced 2026-10-12 10:09:50 +00:00
qidongzhao
bb803962a0
Adding libipt as a submodule and bringing up some bunch of additional support to ensure submodules can be initialized all the time: - Tell GA CI to init submodules: submodules: true arg to checkout step - Add submodule update to make/git/devsetup.sh - Add submodule update to make/git/git_pullall.sh - Update how-to-build docs - Add a pre-commit hook to prevent the common mistake of accidentally rolling back a recent submodule update when switching branches Issue: #5505
54 lines
2.3 KiB
Bash
Executable File
54 lines
2.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# **********************************************************
|
|
# Copyright (c) 2017 Google, Inc. All rights reserved.
|
|
# **********************************************************
|
|
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are met:
|
|
#
|
|
# * Redistributions of source code must retain the above copyright notice,
|
|
# this list of conditions and the following disclaimer.
|
|
#
|
|
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
# this list of conditions and the following disclaimer in the documentation
|
|
# and/or other materials provided with the distribution.
|
|
#
|
|
# * Neither the name of Google, Inc. nor the names of its contributors may be
|
|
# used to endorse or promote products derived from this software without
|
|
# specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
# ARE DISCLAIMED. IN NO EVENT SHALL VMWARE, INC. OR CONTRIBUTORS BE LIABLE
|
|
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
|
# DAMAGE.
|
|
|
|
# Our goal is to update the current branch, pulling in changes from both
|
|
# upstream master and the corresponding upstream feature branch, if any.
|
|
|
|
branch=$(git symbolic-ref -q HEAD)
|
|
branch=${branch##*/}
|
|
|
|
has_remote=$(git ls-remote origin ${branch})
|
|
|
|
if test -z "${has_remote}"; then
|
|
echo "No remote: updating with rebase from master."
|
|
git pull --rebase --prune
|
|
echo -e "\nNow, updating submodules."
|
|
git submodule update --init --recursive
|
|
else
|
|
echo "First, updating with rebase from remote ${branch}."
|
|
git pull --rebase origin ${branch}
|
|
echo -e "\nSecond, merging changes from master."
|
|
git pull --no-rebase --prune
|
|
echo -e "\nNow, updating submodules."
|
|
git submodule update --init --recursive
|
|
fi
|