Merge branch 'pw/rebase-edit-message-for-replayed-merge'

diff --git a/t/perf/run b/t/perf/run
index 85b7bd31d5fe817ce38c82b5e4d5149b7e25e3ab..c7b86104e12a6637b1084d6e02743f6c36df9265 100755 (executable)
--- a/t/perf/run
+++ b/t/perf/run
@@ -84,6 +84,8 @@ set_git_test_installed () {
                GIT_TEST_INSTALLED=$mydir_abs
        fi
        export GIT_TEST_INSTALLED
+       PERF_SET_GIT_TEST_INSTALLED=true
+       export PERF_SET_GIT_TEST_INSTALLED
 }
 
 run_dirs_helper () {
@@ -102,7 +104,7 @@ run_dirs_helper () {
                unset GIT_TEST_INSTALLED
        elif test -d "$mydir"
        then
-               PERF_RESULTS_PREFIX=$(cd $mydir && printf "%s" "$(pwd)" | tr -c "[a-zA-Z0-9]" "_").
+               PERF_RESULTS_PREFIX=bindir$(cd $mydir && printf "%s" "$(pwd)" | tr -c "[a-zA-Z0-9]" "_").
                set_git_test_installed "$mydir"
        else
                rev=$(git rev-parse --verify "$mydir" 2>/dev/null) ||