[Xfce4-commits] <xfce-git-hooks:master> Fix previous commit.

Nick Schermer noreply at xfce.org
Sun Oct 3 13:22:01 CEST 2010


Updating branch refs/heads/master
         to 2ffaf69288b6663e651f25ab83971904f4dff400 (commit)
       from a839454b24644fe97574128dc0a96283fdca0612 (commit)

commit 2ffaf69288b6663e651f25ab83971904f4dff400
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Oct 3 13:20:13 2010 +0200

    Fix previous commit.
    
    The rebase gives troubles, so avoid the rebase (not needed anways).

 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 6756e5a..8dd253b 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)
-    cd /var/www/wiki.xfce.org/ && git pull --rebase
+    GIT_DIR=/var/www/wiki.xfce.org/.git git pull
     ;;
 
   www/www.xfce.org)
-    cd /var/www/www.xfce.org/ && git pull --rebase
+    GIT_DIR=/var/www/www.xfce.org/.git git pull
     ;;
 esac



More information about the Xfce4-commits mailing list