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 :)
--Andy
-> Please show me a transcript of it not working. Here is a transcript of it
-> working just as the tutorial describes it to work:
->
-> joey@kodama:~/tmp/work>ls
-> repo/ src/
-> joey@kodama:~/tmp/work>rm -rf repo src
-> joey@kodama:~/tmp/work>mkdir src
-> joey@kodama:~/tmp/work>echo hi > src/index.html
-> joey@kodama:~/tmp/work>ikiwiki-makerepo git src repo
-> Importing src into git
-> Initialized empty shared Git repository in /home/joey/tmp/work/repo/
-> Initialized empty Git repository in .git/
-> Created initial commit 2254e46: initial commit
-> 2 files changed, 2 insertions(+), 0 deletions(-)
-> create mode 100644 .gitignore
-> create mode 100644 index.html
-> updating 'refs/heads/master'
-> from 0000000000000000000000000000000000000000
-> to 2254e462e31429e755bae56939c4319be8bb912b
-> Also local refs/remotes/origin/master
-> Generating pack...
-> Done counting 4 objects.
-> Deltifying 4 objects...
-> 100% (4/4) done
-> Writing 4 objects...
-> Unpacking 4 objects...
-> 100% (4/4) done
-> refs/heads/master: 0000000000000000000000000000000000000000 -> 2254e462e31429e755bae56939c4319be8bb912b
->
-> Total 4 (delta 0), reused 0 (delta 0)
-> Directory src is now a clone of git repository /home/joey/tmp/work/repo
+> 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
----
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?