(no commit message)

[git.ikiwiki.info.git] / doc / rcs / git.mdwn

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index deddfbd6d4c930b3a7978881215bbdd6c6fd00a0..c627792d7bb858e67885b1fc3fac087efd09ca00 100644 (file)
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -20,20 +20,15 @@ working clones (with working directories) as leaf nodes.  The root
 working clones.
 
 One of the leaf node clone repositories is special; it has working
 working clones.
 
 One of the leaf node clone repositories is special; it has working

-directory which is used to compile the wiki from, and is also used by the
+directory which is used to compile the wiki, and is also used by the

 [[cgi]] to commit changes made via the web interface. It is special
 [[cgi]] to commit changes made via the web interface. It is special

-since the `post-commit` hook for the bare root repository is used to
+since the `post-update` hook for the bare root repository is used to

 trigger an update of this repository, and then an ikiwiki refresh
 updates the published  wiki itself.
 
 The other (optional) leaf node repositories are meant for you to work
 on, and commit to, changes should then be pushed to the bare root
 trigger an update of this repository, and then an ikiwiki refresh
 updates the published  wiki itself.
 
 The other (optional) leaf node repositories are meant for you to work
 on, and commit to, changes should then be pushed to the bare root

-repository.  In theory, you could work on the same leaf node repository
-that ikiwiki uses to compile the wiki from, and the [[cgi]] commits
-to, as long as you ensure that permissions and ownership don't hinder
-the working of the [[cgi]]. This can be done, for example, by using
-ACL's, in practice, it is easier to just setup separate clones for
-yourself.
+repository.

 
 So, to reiterate, when using Git, you probably want to set up three
 repositories:
 
 So, to reiterate, when using Git, you probably want to set up three
 repositories:


@@ -41,20 +36,21 @@ repositories:
 * The root repository. This should be a bare repository (meaning that
   it does not have a working tree checked out), which the other
   repositories will push to/pull from.  It is a bare repository, since
 * The root repository. This should be a bare repository (meaning that
   it does not have a working tree checked out), which the other
   repositories will push to/pull from.  It is a bare repository, since

-  there are problems pushing to a repository that has a working
+  git does not support pushing to a repository that has a working

   directory. This is called _repository_ in [[ikiwiki-makerepo]]'s
   directory. This is called _repository_ in [[ikiwiki-makerepo]]'s

-  manual page. Nominally, this bare repository has a `post-commit` hook
+  manual page. This bare repository has a `post-update` hook

   that either is or calls ikiwiki's git wrapper, which changes to the
   that either is or calls ikiwiki's git wrapper, which changes to the

-  working directory for ikiwiki, does a _git pull_, and refreshes ikiwiki
+  working directory for ikiwiki, does a `git pull`, and refreshes ikiwiki

   to regenerate the wiki with any new content. The [[setup]] page describes
   how to do this.
 
 * The second repository is a clone of the bare root repository, and
   has a working tree which is used as ikiwiki's srcdir for compiling
   to regenerate the wiki with any new content. The [[setup]] page describes
   how to do this.
 
 * The second repository is a clone of the bare root repository, and
   has a working tree which is used as ikiwiki's srcdir for compiling

-  the wiki. **Never** push to this repository. When running as a
-  [[cgi]], the changes are committed to this repository, and pushed to
-  the master repository above. This is called _srcdir_ in
-  [[ikiwiki-makerepo]]'s manual page.
+  the wiki. **Never** push to this repository. It is wise to not make
+  changes or commits directly to this repository, to avoid conflicting
+  with ikiwiki's own changes. When running as a [[cgi]], the changes
+  are committed to this repository, and pushed to the master repository
+  above. This is called _srcdir_ in [[ikiwiki-makerepo]]'s manual page.

 
 * The other (third, fourth, fifth, sixth -- however many pleases you)
   repositories are also clones of the bare root repository above --
 
 * The other (third, fourth, fifth, sixth -- however many pleases you)
   repositories are also clones of the bare root repository above --


@@ -64,7 +60,7 @@ repositories:
   hack on your wiki. you can commit local changes to the version on
   the laptop, perhaps while offline. Any new content should be pushed to the
   bare master repository when you are ready to publish it, and then
   hack on your wiki. you can commit local changes to the version on
   the laptop, perhaps while offline. Any new content should be pushed to the
   bare master repository when you are ready to publish it, and then

-  the post-commit hook of the bare repository will ensure that the
+  the post-update hook of the bare repository will ensure that the

   ikiwiki's source directory is updated, and the ikiwiki refreshed
   with the new content.
 
   ikiwiki's source directory is updated, and the ikiwiki refreshed
   with the new content.
 


@@ -79,7 +75,7 @@ It is **paramount** that you **never** push to the non-bare repository
 Instead, clone the bare repository as mentioned above, and push
 **only** to the bare repository.
 
 Instead, clone the bare repository as mentioned above, and push
 **only** to the bare repository.
 

-The ikiwiki `post-commit` hook should be put in the bare repository.
+The ikiwiki `post-update` hook should be put in the bare repository.

 
 ## git repository with multiple committers
 
 
 ## git repository with multiple committers
 


@@ -87,8 +83,8 @@ It can be tricky to get the permissions right to allow multiple people to
 commit to an ikiwiki git repository. As the [[security]] page mentions,
 for a secure ikiwiki installation, only one person should be able to write
 to ikiwiki's srcdir. When other committers make commits, their commits
 commit to an ikiwiki git repository. As the [[security]] page mentions,
 for a secure ikiwiki installation, only one person should be able to write
 to ikiwiki's srcdir. When other committers make commits, their commits

-should go to the bare repository, which has a `post-update` hook that uses
-ikiwiki to pull the changes to the srcdir.
+should be pushed to the bare repository, which has a `post-update` hook
+that uses ikiwiki to pull the changes to the srcdir.

 
 One setup that will work is to put all committers in a group (say,
 "ikiwiki"), and use permissions to allow that group to commit to the bare git
 
 One setup that will work is to put all committers in a group (say,
 "ikiwiki"), and use permissions to allow that group to commit to the bare git


@@ -147,7 +143,7 @@ is the normal behaviour of ikiwiki, set the configuration of the local wiki:
 
       gitorigin_branch => "",
       ## git post-commit wrapper
 
       gitorigin_branch => "",
       ## git post-commit wrapper

-      wrapper => "/working/dir/.git/hooks/post-commit",
+      git_wrapper => "/working/dir/.git/hooks/post-commit",

 
 Then just committing should refresh the private ikiwiki on the local
 host.  Now just run `ikiwiki -setup localwiki.setup -getctime` and
 
 Then just committing should refresh the private ikiwiki on the local
 host.  Now just run `ikiwiki -setup localwiki.setup -getctime` and