> the directory and makes it into a repository. The setup instuctions have
> examples of doing this. I don't see anything unclear. --[[Joey]]
-Sorry, was not precise enough. It does if you are using the git option. I believe this is partially explained on the rcs/git/ page. However I'm still not totally clear where I should run the command when using git. If I should be in $SRCDIR then updating the instructions to something like
+Sorry, was not precise enough. It does if you are using the git option. I
+believe this is partially explained on the rcs/git/ page. However I'm still
+not totally clear where I should run the command when using git. If I
+should be in $SRCDIR then updating the instructions to something like
REPOSITORY=~/wiki.git
cd $SRCDIR
- ikiwiki-makerepo git $SRCDIR $REPOSITORY
+ ikiwiki-makerepo git $SCDIR $REPOSITORY
-might clear things up a little. Apologies if I'm being a bit dim, learning ikiwiki and git at same time :)
+might clear things up a little. Apologies if I'm being a bit dim, learning
+ikiwiki and git at same time :)
Have tried 3 options
--Andy
+> Initialized empty shared Git repository in /home/deploy/tmp/
+> Initialized empty Git repository in .git/
+> fatal: '/home/deploy/tmp/repo': unable to chdir or not a git archive
+
+Looks like your git does not support GIT_DIR being used with git-init. I
+see some mentions of changes in git's changelog for 1.5.3 that look
+relevant. I've changed ikiwiki-makerepo to use a method more portable to
+older versions of git. --[[Joey]]
+
+Many thanks Joey, upgraded my git, and now have working iki :) -- Andy
+
----
It isn't intended that .ikiwiki be versioned, is it? Do you have a svn:ignore set?
Curious as to why support for CVS is not built in. --[[Luther]]
> See [[todo/CVS_backend|todo/CVS_backend]], but you might consider switching to a better version control system. --[[JoshTriplett]]
+
+----
+
+What is the syntax for specifying the adminuser as an openid user? I've tried a couple things but I'm missing something. Thanks for any pointers. -- [[AdamShand]]
+
+> Just put the openid url in there. It has to be the full url with
+> "http://". --[[Joey]]
+
+----
+
+I apologize if this is the incorrect forum for this question, but I am trying to get ikiwiki set up and running with git. I followed all the directions and all seems to work until I go back and try to make changes. The steps I am performing:
+
+ cd $SRCDIR (e.g. ~/ikisrc)
+ vim index.mdwn (add a couple lines)
+ git commit -a -m 'test'
+ git push
+
+I then get a long error message which reads in part "You asked me to pull without telling me which branch you
+want to merge with, and 'branch.master.merge' in your configuration file does not tell me either." From that point on, I get:
+
+ sws@odin:~/dev/ikisrc$ git push
+ To /home/git/repos/myikiwiki.git
+ ! [rejected] master -> master (non-fast forward)
+ error: failed to push to '/home/git/repos/myikiwiki.git'
+
+If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try to edit I get the same error sequence. What am I doing wrong?