Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2009-10-21 13:51:01 -04:00
commit ba682e0f9a
3 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,17 @@
I am following the laptop wiki with git tip page. I have set up my local and remote wiki as suggested. However, when I try to push my local changes back to the server I get the following error:
Writing objects: 100% (4/4), 359 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
cannot write to /home/ian/ianbarton/.ikiwiki/commitlock: No such file or directory
To ian@wilkesley.org:~/ikiwiki/ianbarton.git
5cf9054..16a871d master -> master
The relevnt bit of my setup file is:
git_wrapper => '/home/ian/ianbarton.git/hooks/post-commit',
Now ~/ianbarton/.ikiwiki exists and is owned and writable by me. I have tried touching commitlock and also removing lock and commitlock before pushing. Any suggestions for further trouble shooting?
Ian.

View File

@ -9,5 +9,3 @@ That's also what I think: such discussions or comments on [[forum]] discussion
pages, or generally on all pages' [[Discussion]] subpages, can be removed if
either they're simply not valid / interesting / ... anymore, or if they've been
used to improve the *real* documentation. --[[tschwinge]]
test

View File

@ -127,6 +127,7 @@ Personal sites and blogs
* [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
* [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
* [Weakish Jiang's Homepage](http://weakish.pigro.net)
* [Nico Schottelius' homepage](http://www.nico.schottelius.org)
Please feel free to add your own ikiwiki site!