Merge branch 'tor-github/pr/1220' (e411fcab) · Commits · The Tor Project / Core / Tor

changes/ticket30979

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		o Minor features (git hooks):
		- Our pre-push git hook now checks for a special file
		before running practracker, so that it only runs on branches
		that are based on master.
		Closes ticket 30979.

+8 −5

Original line number	Diff line number	Diff line
		@@ -28,11 +28,15 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then
		fi
		fi

		if [ -e scripts/maint/practracker/practracker.py ]; then
		if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then
		PT_DIR=scripts/maint/practracker

		if [ -e "${PT_DIR}/practracker.py" ]; then
		if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then
		if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then
		exit 1
		fi
		fi
		fi

		remote="$1"

		@@ -104,4 +108,3 @@ do
		done

		exit 0

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		This file is present to tell our git hooks to run practracker on this branch.