Commit 052ae881 by Calen Pennington

Only import from github when changes are made, rather than exporting. This…

Only import from github when changes are made, rather than exporting. This prevents bugs in the cms from preventing changes via git
parent eedf62a1
...@@ -5,7 +5,7 @@ from django.http import HttpResponse ...@@ -5,7 +5,7 @@ from django.http import HttpResponse
from django.conf import settings from django.conf import settings
from django_future.csrf import csrf_exempt from django_future.csrf import csrf_exempt
from . import sync_with_github, load_repo_settings from . import import_from_github, load_repo_settings
log = logging.getLogger() log = logging.getLogger()
...@@ -46,6 +46,6 @@ def github_post_receive(request): ...@@ -46,6 +46,6 @@ def github_post_receive(request):
log.info('Ignoring changes to non-tracked branch %s in repo %s' % (branch_name, repo_name)) log.info('Ignoring changes to non-tracked branch %s in repo %s' % (branch_name, repo_name))
return HttpResponse('Ignoring non-tracked branch') return HttpResponse('Ignoring non-tracked branch')
sync_with_github(repo) import_from_github(repo)
return HttpResponse('Push received') return HttpResponse('Push received')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment