fixed bug whereby checkout failed if no .gitattributes exists

cs50 · Jul 30, 2017 · d3e2b18 · d3e2b18
1 parent bbd95db
commit d3e2b18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -61,5 +61,5 @@ class CustomInstall(install):
         "console_scripts": ["submit50=submit50:main"]
     },
     url="https://github.com/cs50/submit50",
-    version="2.4.0"
+    version="2.4.1"
 )
diff --git a/submit50.py b/submit50.py
@@ -487,7 +487,10 @@ def submit(org, problem):
     if os.path.isfile(".gitattributes"):
         submit.ATTRIBUTES = ".gitattributes.{}".format(round(time.time()))
         os.rename(".gitattributes", submit.ATTRIBUTES)
-    run("git checkout --force {} .gitattributes".format(branch))
+    try:
+        run("git checkout --force {} .gitattributes".format(branch))
+    except Exception:
+        pass
 
     # set options
     tag = "{}@{}".format(branch, timestamp)