diff options
author | Alexander Nestorov <alexandernst@gmail.com> | 2014-10-08 15:17:22 +0200 |
---|---|---|
committer | Alexander Nestorov <alexandernst@gmail.com> | 2014-10-08 15:17:22 +0200 |
commit | ae88a3d418416011845344e9aa852fe05e9bcccf (patch) | |
tree | 289a2fa17b50a90711d18e28b010e87896ee11d3 /GitAutoDeploy.py | |
parent | 88b6d5bdfd8606fd533e489e2a2b72f6aaa4569b (diff) | |
parent | fb674b80617aaab7771fb42c7595b6926c20bfb5 (diff) | |
download | Git-Auto-Deploy-ae88a3d418416011845344e9aa852fe05e9bcccf.zip Git-Auto-Deploy-ae88a3d418416011845344e9aa852fe05e9bcccf.tar.gz Git-Auto-Deploy-ae88a3d418416011845344e9aa852fe05e9bcccf.tar.bz2 |
Merge pull request #16 from BOFHers/master
Hard reset to origin, no matter what
Diffstat (limited to 'GitAutoDeploy.py')
-rwxr-xr-x | GitAutoDeploy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GitAutoDeploy.py b/GitAutoDeploy.py index 7142cfb..4ad013d 100755 --- a/GitAutoDeploy.py +++ b/GitAutoDeploy.py @@ -82,7 +82,7 @@ class GitAutoDeploy(BaseHTTPRequestHandler): if(not self.quiet): print "\nPost push request received" print 'Updating ' + path - call(['cd "' + path + '" && git fetch origin && git update-index --refresh &> /dev/null && git reset --hard origin/master'], shell=True) + call(['cd "' + path + '" && git fetch origin ; git update-index --refresh &> /dev/null ; git reset --hard origin/master'], shell=True) def deploy(self, path): config = self.getConfig() |