aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaram@atc.tcs.com>2012-06-08 17:08:15 +0530
committerSitaram Chamarty <sitaram@atc.tcs.com>2012-06-08 17:08:15 +0530
commitcd37fe7c36f3d883153dace3844d1edd4f5cadf5 (patch)
treea1f978f7a7a24ae7c72c6740ebb9ed1c839c6ab0 /t/merge-check.t
parentgitolite patch to enable keydir to be a symlink (diff)
downloadgitolite-gentoo-cd37fe7c36f3d883153dace3844d1edd4f5cadf5.tar.gz
gitolite-gentoo-cd37fe7c36f3d883153dace3844d1edd4f5cadf5.tar.bz2
gitolite-gentoo-cd37fe7c36f3d883153dace3844d1edd4f5cadf5.zip
(test suite) changes in test suite due to upgrading to F17
- git version bumps up, causes minor change in t/merge-check.t - for some strange reason apache cannot see /tmp/gitolite-http-authuserfile (I thought private /tmp was only if you enabled selinux...)
Diffstat (limited to 't/merge-check.t')
-rwxr-xr-xt/merge-check.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/merge-check.t b/t/merge-check.t
index b2642ed..443a848 100755
--- a/t/merge-check.t
+++ b/t/merge-check.t
@@ -34,7 +34,7 @@ try "
try "
cd foo; ok
ls -Al; ok; /\.git/
- test-commit aa; ok; /1 files changed, 1 insertions/
+ test-commit aa; ok; /1 file changed, 1 insertion/
tag start; ok
glt push u1 origin master
ok; /new branch.*master.-..master/