Skip to content

Commit

Permalink
! try a better way to !!/pull-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
𝐢𝐁𝐮𝐠 ♦ committed Nov 27, 2018
1 parent 28bad46 commit 87dc8b5
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions gitmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ def pull_local():
return

@staticmethod
def sync_remote():
def sync_remote_2():
if GlobalVars.on_windows:
return False, "We don't do Windows"

Expand All @@ -410,11 +410,14 @@ def sync_remote():
return True, 'Voilà!'

@staticmethod
def sync_remote_2():
def sync_remote():
if GlobalVars.on_windows:
return False, "We don't do Windows"

try:
if GlobalVars.on_master == "master":
if GlobalVars.on_master != "deploy":
git.checkout("deploy")
git.branch('--create-reflog', '-f', 'master', '-t', 'origin/master')
return True, "this is working!"
return True, "wow, this is working!"
except Exception as e:
return False, str(e)

0 comments on commit 87dc8b5

Please sign in to comment.