Skip to content

O
oh-my-zsh
Commit 5fa7824e authored by Thanh Ha's avatar Thanh Ha Committed by Marc Cornellà
Browse files
Options

git-prompt: fix error when multiple tags exist (#6998)

When a commit has multiple tags associated to it, the git-prompt will throw the following error: git_super_status:[:4: integer expression expected: v0.21.x\ntags/v0.21.5, git_super_status:[:7: integer expression expected: origin/v0.21.x, git_super_status:[:11: integer expression expected: origin/v0.21.x, git_super_status:[:14: integer expression expected: v0.21.x git_super_status:[:23: integer expression expected: v0.21.x This is due to the prompt expecting the tag field to be a single word with no spaces in between but if there are multiple tags the python script returns a string with ', ' space separated list of tags. This throws off the parser. The solution is to ensure that the python script returns a space-less string ensuring the git-prompt parser to properly parse the data. Signed-off-by: 's avatarThanh Ha <zxiiro@linux.com>
parent a24a0b1a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
plugins/git-prompt/gitstatus.py
View file @ 5fa7824e
...@@ -22,7 +22,7 @@ def get_tagname_or_hash(): ...@@ -22,7 +22,7 @@ def get_tagname_or_hash():
tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1] tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
if tagname: if tagname:
return tagname return tagname.replace(' ', '')
elif hash_: elif hash_:
return hash_ return hash_
return None return None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment