Merge branch 'stable'

diff --combined tests/setup.sh
index 1e061078a2584b0b74eaa6976cf126896851a231,b9475a3996d0054aeee0e217d786197a34917b73..b21908d10bbc7530e2f19e26b24f3d66ecf7510b
--- 1/tests/setup.sh
--- 2/tests/setup.sh
+++ b/tests/setup.sh
@@@ -15,6 -15,7 +15,7 @@@
  # run_test 'repo index' 'cgit_url "/" | tidy -e'
  # run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
  
+ unset CDPATH
  
  mkrepo() {
        name=$1
@@@ -62,7 -63,6 +63,7 @@@ enable-log-linecount=
  summary-log=5
  summary-branches=5
  summary-tags=5
 +clone-url=git://example.org/\$CGIT_REPO_URL.git
  
  repo.url=foo
  repo.path=$PWD/trash/repos/foo/.git