[Xfce4-commits] <xfce-git-hooks:master> Revert "Try relocating to the working copies before pulling."

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 04fd697c60b3b2418fed346483f3e19b219edee9 (commit)
       from deb0f8f0f314cdbfa2ffdb9b3285fd60ffe7d98e (commit)

commit 04fd697c60b3b2418fed346483f3e19b219edee9
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon May 24 00:16:36 2010 +0200

    Revert "Try relocating to the working copies before pulling."
    
    This reverts commit deb0f8f0f314cdbfa2ffdb9b3285fd60ffe7d98e.
    
    Users are not logged in to a proper shell and it seems like the pushd
    experiment is not going to work. Exporting GIT_DIR doesn't seem to be
    enough for correct pulling, so I'm out of ideas for tonight...

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

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