summaryrefslogtreecommitdiffabout
path: root/tests/setup.sh
authorLars Hjemli <hjemli@gmail.com>2008-10-05 11:13:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-10-05 11:13:33 (UTC)
commit20c895f6889a66d7cf43c67a7c22df6ef324ed5d (patch) (side-by-side diff)
tree4fc0c044fa0919cab562b371191add67114d07a9 /tests/setup.sh
parent204669ff4a4028a82cc48e9319632595ba3ff703 (diff)
parentb575115d9d93e45cdbcd5d066cc445d34639ae6a (diff)
downloadcgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.zip
cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.gz
cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.bz2
Merge branch 'lh/escape-urls'
* lh/escape-urls: ui-shared.c: use html_url_arg() html.c: add html_url_arg
Diffstat (limited to 'tests/setup.sh') (more/less context) (show whitespace changes)
-rwxr-xr-xtests/setup.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index e37306e..1457dd5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -32,4 +32,11 @@ mkrepo() {
git commit -m "commit $n"
done
+ if test "$3" = "testplus"
+ then
+ echo "hello" >a+b
+ git add a+b
+ git commit -m "add a+b"
+ git branch "1+2"
+ fi
cd $dir
}
@@ -41,4 +48,5 @@ setup_repos()
mkrepo trash/repos/foo 5 >/dev/null
mkrepo trash/repos/bar 50 >/dev/null
+ mkrepo trash/repos/foo+bar 10 testplus >/dev/null
cat >trash/cgitrc <<EOF
virtual-root=/
@@ -62,4 +70,8 @@ repo.url=bar
repo.path=$PWD/trash/repos/bar/.git
repo.desc=the bar repo
+
+repo.url=foo+bar
+repo.path=$PWD/trash/repos/foo+bar/.git
+repo.desc=the foo+bar repo
EOF
}
@@ -114,3 +126,2 @@ cgit_url()
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
}
-