Skip to content

Commit

Permalink
! git looks better
Browse files Browse the repository at this point in the history
  • Loading branch information
𝐢𝐁𝐮𝐠 ♦ committed Oct 29, 2018
1 parent 3d66898 commit 7cd403e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions gitmanager.py
Expand Up @@ -276,8 +276,8 @@ def prepare_git_for_operation(blacklist_file_name):
local_ref = git("rev-parse", "refs/remotes/origin/master").strip()
remote_ref = git("rev-parse", "master").strip()
if local_ref != remote_ref:
local_log = git.log(r"--pretty=`\[%h\]` %cn: %s", "-1", str(local_ref)).strip()
remote_log = git.log(r"--pretty=`\[%h\]` %cn: %s", "-1", str(remote_ref)).strip()
local_log = git.log(r"--pretty=`[%h]` *%cn*: %s", "-1", str(local_ref)).strip()
remote_log = git.log(r"--pretty=`[%h]` *%cn*: %s", "-1", str(remote_ref)).strip()
return False, "HEAD isn't at tip of origin's master branch (local {}, remote {})".format(
local_log, remote_log)

Expand Down
4 changes: 1 addition & 3 deletions globalvars.py
Expand Up @@ -168,9 +168,7 @@ def reload():
GlobalVars.commit = commit

GlobalVars.commit_with_author = "`{}` ({}: {})".format(
commit['id'],
commit['author'][0] if type(commit['author']) in {list, tuple} else commit['author'],
commit['message'])
commit['id'], commit['author'], commit['message'])

GlobalVars.on_master = git_ref()
GlobalVars.s = "[ {} ] SmokeDetector started at [rev {}]({}/commit/{}) (running on {}, Python {})".format(
Expand Down

0 comments on commit 7cd403e

Please sign in to comment.