summaryrefslogtreecommitdiffstats
path: root/GitAutoDeploy.py
diff options
context:
space:
mode:
authorTorben <torben.letorbi@gmail.com>2015-07-07 16:09:01 +0200
committerTorben <torben.letorbi@gmail.com>2015-07-07 16:28:00 +0200
commitf40eaa8127624a7fd8dbf77b97c8db4130d6d2b8 (patch)
tree909d409e986b5e21b721ea196e318a2a89dc3257 /GitAutoDeploy.py
parentb002375aa175d289d00a6c1343edf34eba766ee2 (diff)
downloadGit-Auto-Deploy-f40eaa8127624a7fd8dbf77b97c8db4130d6d2b8.zip
Git-Auto-Deploy-f40eaa8127624a7fd8dbf77b97c8db4130d6d2b8.tar.gz
Git-Auto-Deploy-f40eaa8127624a7fd8dbf77b97c8db4130d6d2b8.tar.bz2
Fix locked repo bug by updating git deploy command line
Diffstat (limited to 'GitAutoDeploy.py')
-rwxr-xr-xGitAutoDeploy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/GitAutoDeploy.py b/GitAutoDeploy.py
index 5aaebae..5fd5d51 100755
--- a/GitAutoDeploy.py
+++ b/GitAutoDeploy.py
@@ -140,7 +140,7 @@ class GitAutoDeploy(BaseHTTPRequestHandler):
if(not self.quiet):
print "\nPost push request received"
print 'Updating ' + path
- res = call(['sleep 5; cd "' + path + '" && git fetch origin ; git update-index --refresh &> /dev/null ; git reset --hard origin/' + branch], shell=True)
+ res = call(['sleep 5; cd "' + path + '" && unset GIT_DIR && git fetch origin && git update-index --refresh && git reset --hard origin/' + branch], shell=True)
call(['echo "Pull result: ' + str(res) + '"'], shell=True)
return res