From 4bf7459153b2799d7f0364fefa2c49279468fdfb Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Mon, 28 May 2012 11:41:43 -0400
Subject: [PATCH] add git reset --hard HEAD to git command in
 quickedit_git_reload

---
 djangoapps/courseware/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djangoapps/courseware/views.py b/djangoapps/courseware/views.py
index 6aff13c33e..72ed3a2055 100644
--- a/djangoapps/courseware/views.py
+++ b/djangoapps/courseware/views.py
@@ -437,7 +437,7 @@ def quickedit_git_reload(request):
         
     if 'gitupdate' in request.POST:
         import os			# FIXME - put at top?
-        cmd = "cd ../data%s; git pull origin %s" % (xp,xp.replace('/',''))
+        cmd = "cd ../data%s; git reset --hard HEAD; git pull origin %s" % (xp,xp.replace('/',''))
         msg += '<p>cmd: %s</p>' % cmd
         ret = os.popen(cmd).read()
         msg += '<p><pre>%s</pre></p>' % ret.replace('<','&lt;')