Browse files

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

  • Loading branch information...
2 parents e7abc5d + c1cc87a commit 9966246d3a7410f5e66e4e887a923b65cd9a8cd3 John MacFarlane committed Nov 2, 2012
Showing with 10 additions and 9 deletions.
  1. +2 −1 README.markdown
  2. +8 −8 data/post-update
View
3 README.markdown
@@ -55,7 +55,7 @@ install][] instructions.
[GHC]: http://www.haskell.org/ghc/
[here]: http://www.haskell.org/ghc/
[cabal-install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall
-[quick install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall#Quick Installation on Unix
+[quick install]: http://hackage.haskell.org/trac/hackage/wiki/CabalInstall#Quick+Installation+on+Unix
Once you've got cabal-install, installing gitit is trivial:
@@ -330,6 +330,7 @@ setting of `math` in the configuration file:
3. `raw`: Math will be rendered as raw LaTeX codes.
+[jsMath]: http://www.math.union.edu/~dpvc/jsmath/
[jsMath download page]: http://sourceforge.net/project/showfiles.php?group_id=172663
Restricting access
View
16 data/post-update
@@ -11,9 +11,9 @@
#
# To enable this hook, make this file executable by "chmod +x post-update".
-git-update-server-info
+git update-server-info
-is_bare=$(git-config --get --bool core.bare)
+is_bare=$(git config --get --bool core.bare)
if [ -z "$is_bare" ]
then
@@ -30,7 +30,7 @@ update_wc() {
echo "E:push to non-bare repository requires a HEAD reflog" >&2
exit 1
fi
- if (cd $GIT_WORK_TREE; git-diff-files -q --exit-code >/dev/null)
+ if (cd $GIT_WORK_TREE; git diff-files -q --exit-code >/dev/null)
then
wc_dirty=0
else
@@ -56,23 +56,23 @@ update_wc() {
new=$(git rev-parse HEAD)
echo "W:stashing dirty $desc - see git-stash(1)" >&2
( trap 'echo trapped $$; git symbolic-ref HEAD "'"$ref"'"' 2 3 13 15 ERR EXIT
- git-update-ref --no-deref HEAD HEAD@{1}
+ git update-ref --no-deref HEAD HEAD@{1}
cd $GIT_WORK_TREE
git stash save "dirty $desc before update to $new";
- git-symbolic-ref HEAD "$ref"
+ git symbolic-ref HEAD "$ref"
)
fi
# eye candy - show the WC updates :)
echo "Updating working copy" >&2
(cd $GIT_WORK_TREE
- git-diff-index -R --name-status HEAD >&2
- git-reset --hard HEAD)
+ git diff-index -R --name-status HEAD >&2
+ git reset --hard HEAD)
}
if [ "$is_bare" = "false" ]
then
- active_branch=`git-symbolic-ref HEAD`
+ active_branch=`git symbolic-ref HEAD`
export GIT_DIR=$(cd $GIT_DIR; pwd)
GIT_WORK_TREE=${GIT_WORK_TREE-..}
for ref

0 comments on commit 9966246

Please sign in to comment.