Merge pull request #880

* stv/fix/oom-origin:
  Add missing import
  Handle out-of-memory exception on Sysadmin Courses

lms/djangoapps/dashboard/sysadmin.py

@@ -28,6 +28,7 @@
 from django.views.generic.base import TemplateView
 from opaque_keys.edx.locations import SlashSeparatedCourseKey
 from path import Path as path
+from six import text_type
 import sys
 
 import dashboard.git_import as git_import
@@ -403,6 +404,8 @@ def git_info_for_course(self, cdir):
             info = [output_json['commit'],
                     output_json['date'],
                     output_json['author'], ]
+        except OSError as error:
+            log.warning(text_type(u"Error fetching git data: %s - %s"), text_type(cdir), text_type(error))
         except (ValueError, subprocess.CalledProcessError):
             pass