fix release.sh: git_assert_branch_in_sync not exist in 3.4
Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
@ -6,7 +6,7 @@ source ./scripts/test_lib.sh
|
|||||||
|
|
||||||
VER=$1
|
VER=$1
|
||||||
PROJ="etcd"
|
PROJ="etcd"
|
||||||
REPOSITORY="${REPOSITORY:-git@github.com:etcd-io/etcd.git}"
|
REPOSITORY="${REPOSITORY:-https://github.com/etcd-io/etcd.git}"
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
if [ -z "$1" ]; then
|
||||||
echo "Usage: ${0} VERSION" >> /dev/stderr
|
echo "Usage: ${0} VERSION" >> /dev/stderr
|
||||||
|
@ -69,8 +69,6 @@ main() {
|
|||||||
cd "${reldir}/etcd" || exit 2
|
cd "${reldir}/etcd" || exit 2
|
||||||
git checkout "${BRANCH}" || exit 2
|
git checkout "${BRANCH}" || exit 2
|
||||||
git pull origin
|
git pull origin
|
||||||
|
|
||||||
git_assert_branch_in_sync || exit 2
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If a release version tag already exists, use it.
|
# If a release version tag already exists, use it.
|
||||||
|
Reference in New Issue
Block a user