summaryrefslogtreecommitdiff
path: root/plugins/git-prompt
diff options
context:
space:
mode:
authorTuowen Zhao <ztuowen@gmail.com>2018-09-10 10:50:45 -0600
committerTuowen Zhao <ztuowen@gmail.com>2018-09-10 10:50:45 -0600
commit5ece6ef2f07c58672a9c965dbbbb62a42386fb2d (patch)
tree285e6382f9e900779bce60da02f1f0d97e467e26 /plugins/git-prompt
parent852e7fe005267f74f3c04a4ddbb310522eee8014 (diff)
parentfe5fe81c8cfa66981c51d149a35fe545f2ef5016 (diff)
downloadzsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.tar.gz
zsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.tar.bz2
zsh-5ece6ef2f07c58672a9c965dbbbb62a42386fb2d.zip
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/git-prompt')
-rw-r--r--plugins/git-prompt/git-prompt.plugin.zsh2
-rw-r--r--plugins/git-prompt/gitstatus.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 5175bf70f..2776f297f 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,5 +1,5 @@
# ZSH Git Prompt Plugin from:
-# http://github.com/olivierverdier/zsh-git-prompt
+# https://github.com/olivierverdier/zsh-git-prompt
__GIT_PROMPT_DIR="${0:A:h}"
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 14d875973..a4d07cde6 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -22,7 +22,7 @@ def get_tagname_or_hash():
tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
if tagname:
- return tagname
+ return tagname.replace(' ', '')
elif hash_:
return hash_
return None