From 093cc5830086f8a5a69e8792f8d0f16af496233c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 29 Jun 2019 12:37:49 +0800 Subject: [PATCH] 1 --- scripts/githooks/pre-commit | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit index 5f99aab..cec9697 100755 --- a/scripts/githooks/pre-commit +++ b/scripts/githooks/pre-commit @@ -5,17 +5,9 @@ if [ $? -eq 0 ]; then exit 0 fi -# git branch|grep -q "* dev" -# if [ $? -ne 0 ]; then -# echo 'not dev branch, exit' -# exit 0 -# fi - -# echo 'no sync protocol to svn' - git branch|grep -q "* master" if [ $? -eq 0 ]; then - svn update ~/opensource/game2001_proto/resources/ - cp -f server/tools/protobuild/cs_*.proto ~/opensource/game2001_proto/resources/ - svn commit -m '同步协议' ~/opensource/game2001_proto/resources/ + svn update ../client_proto/resources/ + cp -f server/tools/protobuild/cs_*.proto ../client_proto/resources/ + svn commit -m '同步协议' ../client_proto/resources/ fi