diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
| commit | ef687dbd9da6e44ffcfeef3216b531d22d5e43d4 (patch) | |
| tree | ada53bca0059d2fbf0def30272c6905b277b983a | |
| parent | a04694138a169333247662c824ac21297e922d15 (diff) | |
| parent | 2ec075d9035cecef392573d161577395cabc3fd8 (diff) | |
| download | git-ef687dbd9da6e44ffcfeef3216b531d22d5e43d4.tar.gz | |
Merge branch 'nd/test-helpers'
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
* nd/test-helpers:
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
| -rw-r--r-- | wrap-for-bin.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh index db0ec6a737..22b6e4948f 100644 --- a/wrap-for-bin.sh +++ b/wrap-for-bin.sh @@ -17,6 +17,7 @@ fi GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}" GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale' PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH" + export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR if test -n "$GIT_TEST_GDB" |