summaryrefslogtreecommitdiff
path: root/plugins/git-prompt/gitstatus.py
AgeCommit message (Collapse)Author
2021-01-15feat(git-prompt): display stash count in promptArnaud Thimel
2020-12-03fix(git-prompt): make `gitstatus.py` python3-compatible (#9186)Stimim Chen
check_output() in get_tagname_or_hash() returns bytes instead of str in python3. Decode the return value to utf-8, this works in both python2 and python3. Co-authored-by: Stimim Chen <stimim@google.com>
2019-12-20Rewrite gitstatus collection to be more robust (#7322)lieryan
Fix the finicky parsing logic and just ask git the necessary information directly.
2019-04-10git-prompt: fix LANG override for git status callMarc Cornellà
The previous version modified the whole environment leading to problems (see #7757). This version *adds* LANG=C to the current env, without overriding it completely. Fixes #7757.
2019-04-07git-prompt: run git status with LANG=C (#6087)sheveko
As described in #6086 there will be an error when one set another language than English.
2018-07-29git-prompt: fix error when multiple tags exist (#6998)Thanh Ha
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: Thanh Ha <zxiiro@linux.com>
2018-04-30Parse branch-name for fresh repo (#6302)Oliver Baumann
Inside a fresh git repo, i.e. immediately after a `git init`, usually no commit template exists yet. In this case, git renders a different status message than "Initial commit on". We should consider this message when attempting to parse out the branch name. Fixes #6301
2015-08-17Show tag name when detached status if possibleKentaro Wada
2015-08-16Clean up gitstatus.pyMarc Cornellà
2015-08-16Fix for initial or detached status branch infoKentaro Wada
2015-08-16Parse UTF-8 output from git statusMarc Cornellà
2015-08-16git-prompt: collect all git status information by one cmdKentaro Wada
This commit uses the `git status --porcelain -b` format to gather the number of ahead and behind commits related to the remote branch.
2015-08-16Cleanup the rest of gitstatus.pyMarc Cornellà
2015-08-16Pull in simplified version from @wkentaroMarc Cornellà
This version uses `git status --porcelain` instead of making multiple calls to `git status`.
2015-08-16Pull in latest version from olivierverdier/zsh-git-promptMarc Cornellà
2014-07-16Revert "specify python2 in shebang"ncanceill
"/usr/bin/python2" does not exist on Mac OSX (see #2382), so fuck people who have "python" symlinked to "python3" This reverts commit e5ed07e2b5740346d2a32b3a47204612d8808723
2014-06-04specify python2 in shebangncanceill
as suggested in #2382
2014-04-18Fix for Python3Paweł Tomak
In Python3 without universal_newlines set to True output from Popen was byte-encoded.
2014-02-21grab last item in list which is the branch instead of relying on position.Chris Jones
2014-02-21Much needed PEP8 love. Use spaces, not tabs.Chris Jones
2011-04-28add git-prompt plugin from olivierverdier/zsh-git-promptJustin Riley