Skip to content
This repository
Browse code

Merge branch 'master' of github.com:jgm/gitit

  • Loading branch information...
commit 9966246d3a7410f5e66e4e887a923b65cd9a8cd3 2 parents e7abc5d + c1cc87a
John MacFarlane authored

Showing 2 changed files with 10 additions and 9 deletions. Show diff stats Hide diff stats

  1. +2 1  README.markdown
  2. +8 8 data/post-update
3  README.markdown
Source Rendered
@@ -55,7 +55,7 @@ install][] instructions.
55 55 [GHC]: http://www.haskell.org/ghc/
56 56 [here]: http://www.haskell.org/ghc/
57 57 [cabal-install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall
58   -[quick install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall#Quick Installation on Unix
  58 +[quick install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall#Quick+Installation+on+Unix
59 59
60 60 Once you've got cabal-install, installing gitit is trivial:
61 61
@@ -330,6 +330,7 @@ setting of `math` in the configuration file:
330 330
331 331 3. `raw`: Math will be rendered as raw LaTeX codes.
332 332
  333 +[jsMath]: http://www.math.union.edu/~dpvc/jsmath/
333 334 [jsMath download page]: http://sourceforge.net/project/showfiles.php?group_id=172663
334 335
335 336 Restricting access
16 data/post-update
@@ -11,9 +11,9 @@
11 11 #
12 12 # To enable this hook, make this file executable by "chmod +x post-update".
13 13
14   -git-update-server-info
  14 +git update-server-info
15 15
16   -is_bare=$(git-config --get --bool core.bare)
  16 +is_bare=$(git config --get --bool core.bare)
17 17
18 18 if [ -z "$is_bare" ]
19 19 then
@@ -30,7 +30,7 @@ update_wc() {
30 30 echo "E:push to non-bare repository requires a HEAD reflog" >&2
31 31 exit 1
32 32 fi
33   - if (cd $GIT_WORK_TREE; git-diff-files -q --exit-code >/dev/null)
  33 + if (cd $GIT_WORK_TREE; git diff-files -q --exit-code >/dev/null)
34 34 then
35 35 wc_dirty=0
36 36 else
@@ -56,23 +56,23 @@ update_wc() {
56 56 new=$(git rev-parse HEAD)
57 57 echo "W:stashing dirty $desc - see git-stash(1)" >&2
58 58 ( trap 'echo trapped $$; git symbolic-ref HEAD "'"$ref"'"' 2 3 13 15 ERR EXIT
59   - git-update-ref --no-deref HEAD HEAD@{1}
  59 + git update-ref --no-deref HEAD HEAD@{1}
60 60 cd $GIT_WORK_TREE
61 61 git stash save "dirty $desc before update to $new";
62   - git-symbolic-ref HEAD "$ref"
  62 + git symbolic-ref HEAD "$ref"
63 63 )
64 64 fi
65 65
66 66 # eye candy - show the WC updates :)
67 67 echo "Updating working copy" >&2
68 68 (cd $GIT_WORK_TREE
69   - git-diff-index -R --name-status HEAD >&2
70   - git-reset --hard HEAD)
  69 + git diff-index -R --name-status HEAD >&2
  70 + git reset --hard HEAD)
71 71 }
72 72
73 73 if [ "$is_bare" = "false" ]
74 74 then
75   - active_branch=`git-symbolic-ref HEAD`
  75 + active_branch=`git symbolic-ref HEAD`
76 76 export GIT_DIR=$(cd $GIT_DIR; pwd)
77 77 GIT_WORK_TREE=${GIT_WORK_TREE-..}
78 78 for ref

0 comments on commit 9966246

Please sign in to comment.
Something went wrong with that request. Please try again.