1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-23 01:26:39 +08:00
Commit Graph

36 Commits

Author SHA1 Message Date
David Chin
bf713e2c11
Update README for git-prompt to clarify how to use (#10922)
* Add note about need to customise theme.

It may not be obvious that the theme needs to be customised. See: https://github.com/ohmyzsh/ohmyzsh/issues/9395

* Clarify type of theme customisation needed.
2024-04-06 10:23:19 -07:00
Lennart Ochel
a482a02915
feat(git-prompt): add option to show upstream branch (#11336) 2022-11-14 17:38:44 +01:00
Lennart Ochel
fb66b67d68
feat(git-prompt): show deleted files (#11245) 2022-11-12 11:46:06 +01:00
Carlo Sala
0818df057c
fix: use python3 for all python invocations (#10832) 2022-04-09 14:45:42 +02:00
Marc Cornellà
bc7bc74469
fix(git-prompt): fix clean prompt when stash is not empty (#9978)
Fixes #9978
2021-12-29 11:54:13 +01:00
Marc Cornellà
c06197ad95
chore: fix comment bulk replace 2021-12-28 14:34:09 +01:00
Curtis Rueden
2d32e9be66
refactor: handle $0 according to the Zsh plugin standard (#10518)
For details and rationale, see:
https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html

Closes #10518
2021-12-28 12:29:24 +01:00
Aidin Gharibnavaz
f75f8bb930
docs(git-prompt): explain stashed icon (⚑) (#9619)
Stashed icon was added in #4880
2021-01-27 17:28:04 +01:00
Arnaud Thimel
47c04d921e feat(git-prompt): display stash count in prompt 2021-01-15 19:03:29 +01:00
Arnaud Thimel
63477411eb feat(git-prompt): display untracked files count
Closes #8435
Closes #4880
2021-01-15 19:02:57 +01:00
Stimim Chen
1ac40cd445
fix(git-prompt): make gitstatus.py python3-compatible (#9186)
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>
2020-12-03 12:00:56 +01:00
Gonçalo Queirós
a39bee8d11
git-prompt: document Python prerequisite in README (#9336) 2020-10-13 11:28:51 +02:00
lieryan
e204c596ef Rewrite gitstatus collection to be more robust (#7322)
Fix the finicky parsing logic and just ask git the necessary information
directly.
2019-12-20 23:33:39 -08:00
Jacob Tomaw
1ba0af650a Use safer append to hook function arrays (#8406)
Use add-zsh-hook to add functions to hooks. That way they won't be added again
when doing `source ~/.zshrc` multiple times.

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
2019-11-19 18:47:12 +01:00
Marc Cornellà
3c8f73c312 git-prompt: fix LANG override for git status call
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-10 20:30:30 +02:00
Jayden Thrasher
afb28d337d git-prompt: add README (#7554) 2019-04-09 21:21:26 +02:00
sheveko
3cfcf5e0aa git-prompt: run git status with LANG=C (#6087)
As described in #6086 there will be an error when one set another
language than English.
2019-04-07 20:21:54 +02:00
Janosch Schwalm
19b925e741 use https everywhere (#6574)
* use https everywhere

* use https links on the files that are left

Also, removed some broken links and updated redirections.
2018-08-07 20:42:01 +02:00
Thanh Ha
5fa7824ea5 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: Thanh Ha <zxiiro@linux.com>
2018-07-29 17:45:35 +02:00
Oliver Baumann
493c30954b Parse branch-name for fresh repo (#6302)
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
2018-04-30 16:25:02 +02:00
Kentaro Wada
c4ba3065a1 Show tag name when detached status if possible 2015-08-17 18:22:27 +09:00
Marc Cornellà
3c698743fa Clean up gitstatus.py 2015-08-16 23:21:48 +02:00
Kentaro Wada
45473c3a81 Fix for initial or detached status branch info 2015-08-16 23:02:17 +02:00
Marc Cornellà
30bed07e9c Parse UTF-8 output from git status 2015-08-16 23:02:16 +02:00
Kentaro Wada
94007f7db2 git-prompt: collect all git status information by one cmd
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-16 23:02:15 +02:00
Marc Cornellà
6ff53d173b Cleanup of git-prompt plugin file 2015-08-16 23:02:14 +02:00
Marc Cornellà
1d133ff11f Cleanup the rest of gitstatus.py 2015-08-16 23:02:13 +02:00
Marc Cornellà
5642014ff1 Pull in simplified version from @wkentaro
This version uses `git status --porcelain` instead of making
multiple calls to `git status`.
2015-08-16 23:02:12 +02:00
Marc Cornellà
6443626a6b Pull in latest version from olivierverdier/zsh-git-prompt 2015-08-16 23:02:11 +02:00
Marc Cornellà
2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
ncanceill
5756ea0101 Revert "specify python2 in shebang"
"/usr/bin/python2" does not exist on Mac OSX (see #2382), so fuck people who have
"python" symlinked to "python3"

This reverts commit e5ed07e2b5
2014-07-16 12:27:01 +02:00
ncanceill
e5ed07e2b5 specify python2 in shebang
as suggested in #2382
2014-06-04 12:36:34 +02:00
Paweł Tomak
cee52283d8 Fix for Python3
In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
2014-04-18 23:09:38 +02:00
Chris Jones
c397000b3b grab last item in list which is the branch instead of relying on position. 2014-02-21 22:48:38 -08:00
Chris Jones
7a546362d3 Much needed PEP8 love. Use spaces, not tabs. 2014-02-21 22:47:56 -08:00
Justin Riley
e5f77b8f04 add git-prompt plugin from olivierverdier/zsh-git-prompt 2011-04-28 15:05:52 -04:00