Delete a ref for origin/gh-pages when deploying

Fixes #14
pyvec · Feb 28, 2017 · 51b8954 · 51b8954
1 parent d0f0b5b
commit 51b8954
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/elsa/_deployment.py b/elsa/_deployment.py
@@ -42,6 +42,9 @@ def deploy(html_dir, *, push):
 
     print('Rewriting gh-pages branch...')
     run(['git', 'branch', '-D', 'gh-pages'], check=False, quiet=True)
+    ref = '.git/refs/remotes/origin/gh-pages'
+    if os.path.exists(ref):
+        os.remove(ref)
     commit_message = 'Deploying {}'.format(random.choice(COMMIT_EMOJIS))
     run([
         'ghp-import',

diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -307,8 +307,6 @@ def test_deploy_git(elsa, cname, push, gitrepo):
 
 
 def test_deploy_twice_only_one_commit(elsa, push, gitrepo):
-    if is_true(push):
-        pytest.xfail('https://github.com/pyvec/elsa/issues/14')
     elsa.run('deploy', push)
     elsa.run('deploy', push)
     assert len(commits()) == 1