aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/coccinelle/check_cocci_parse.sh1
-rwxr-xr-xscripts/git/pre-push.git-hook4
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/coccinelle/check_cocci_parse.sh b/scripts/coccinelle/check_cocci_parse.sh
index 5c27c7bc88..220b405940 100755
--- a/scripts/coccinelle/check_cocci_parse.sh
+++ b/scripts/coccinelle/check_cocci_parse.sh
@@ -30,6 +30,7 @@ if test $# -ge 1 ; then
"$try_parse" "$@"
exitcode=$?
else
+ cd "$top" || exit 1
# This is the layout in 0.3.5
"$try_parse" \
src/lib/*/*.[ch] \
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
index 2f3608029a..7be184ec6e 100755
--- a/scripts/git/pre-push.git-hook
+++ b/scripts/git/pre-push.git-hook
@@ -28,6 +28,8 @@ upstream_name=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
workdir=$(git rev-parse --show-toplevel)
+cd "$workdir" || exit 1
+
remote="$1"
remote_name=$(git remote --verbose | grep "$2" | awk '{print $1}' | head -n 1)
@@ -83,7 +85,7 @@ do
# We want word splitting here, because file names are space separated
# shellcheck disable=SC2086
- if ! "$workdir/"scripts/git/pre-commit.git-hook $CHECK_FILES; then
+ if ! scripts/git/pre-commit.git-hook $CHECK_FILES ; then
exit 1
fi