Merge branch 'bc/object-id'

diff --git a/t/valgrind/valgrind.sh b/t/valgrind/valgrind.sh
index 6b87c91b60cde4b19d6644227548f1ba6b226545..669ebaf68be006ee53911f02da72e56cb5a100f0 100755 (executable)
--- a/t/valgrind/valgrind.sh
+++ b/t/valgrind/valgrind.sh
@@ -1,9 +1,20 @@
 #!/bin/sh
 
 base=$(basename "$0")
+case "$base" in
+test-*)
+       program="$GIT_VALGRIND/../../t/helper/$base"
+       ;;
+*)
+       program="$GIT_VALGRIND/../../$base"
+       ;;
+esac
 
 TOOL_OPTIONS='--leak-check=no'
 
+test -z "$GIT_VALGRIND_ENABLED" &&
+exec "$program" "$@"
+
 case "$GIT_VALGRIND_MODE" in
 memcheck-fast)
        ;;
@@ -26,4 +37,4 @@ exec valgrind -q --error-exitcode=126 \
        --log-fd=4 \
        --input-fd=4 \
        $GIT_VALGRIND_OPTIONS \
-       "$GIT_VALGRIND"/../../"$base" "$@"
+       "$program" "$@"