Merge branch 'github/main'

pull/342/head
Automerger 2 years ago
commit f59028f4da

@ -54,18 +54,4 @@ include(":feature:bookmarks")
include(":feature:topic")
include(":lint")
include(":sync:work")
include(":sync:sync-test")
val prePushHook = file(".git/hooks/pre-push")
val commitMsgHook = file(".git/hooks/commit-msg")
val hooksInstalled = commitMsgHook.exists()
&& prePushHook.exists()
&& prePushHook.readBytes().contentEquals(file("tools/pre-push").readBytes())
if (!hooksInstalled) {
exec {
commandLine("tools/setup.sh")
workingDir = rootProject.projectDir
}
}
include(":sync:sync-test")

@ -20,11 +20,6 @@ NC='\033[0m' # No Color
GIT_DIR=$(git rev-parse --git-dir 2> /dev/null)
GIT_ROOT=$(git rev-parse --show-toplevel 2> /dev/null)
if [[ ! "$GIT_ROOT" =~ /nowinandroid$ ]]; then
echo -e "${RED}ERROR:${NC} Please run this script from the cloned nowinandroid directory."
exit 1
fi
echo "Installing git commit-message hook"
echo
curl -sSLo "${GIT_DIR}/hooks/commit-msg" \

Loading…
Cancel
Save