[Xfce4-commits] <xfce-git-hooks:master> Change the way the www hooks work.

[Nick Schermer]

Updating branch refs/heads/master
         to a839454b24644fe97574128dc0a96283fdca0612 (commit)
       from 237938579e66a1898c8502f267cf278c2ce9c6ec (commit)

commit a839454b24644fe97574128dc0a96283fdca0612
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Oct 3 13:09:24 2010 +0200

    Change the way the www hooks work.
    
    With the GIT_DIR we get a lot of warnings on the like:
    
    [...]
    lib/tpl/xfce/print.css: needs update
    lib/tpl/xfce/rtl.css: needs update
    lib/tpl/xfce/style.ini: needs update
    refusing to pull with rebase: your working tree is not up-to-date
    
    A normal cd into the directory and then a pull seems to avoid this
    problem.

 hooks/post-update-03-www-pull |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hooks/post-update-03-www-pull b/hooks/post-update-03-www-pull
index a77d66f..6756e5a 100755
--- a/hooks/post-update-03-www-pull
+++ b/hooks/post-update-03-www-pull
@@ -2,10 +2,10 @@
 
 case "$REPO" in
   www/wiki.xfce.org)
-    GIT_DIR=/var/www/wiki.xfce.org/.git git pull --rebase
+    cd /var/www/wiki.xfce.org/ && git pull --rebase
     ;;
 
   www/www.xfce.org)
-    GIT_DIR=/var/www/www.xfce.org/.git git pull --rebase
+    cd /var/www/www.xfce.org/ && git pull --rebase
     ;;
 esac