mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
I dont know why these changes were showing up. but I reverted them
This commit is contained in:
parent
594ad21b32
commit
7e9fa1a5f8
2 changed files with 3 additions and 2 deletions
|
@ -19,6 +19,7 @@ function git_prompt_info() {
|
||||||
|
|
||||||
local ref
|
local ref
|
||||||
ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
|
ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
|
||||||
|
|| ref=$(__git_prompt_git describe --tags --exact-match HEAD 2> /dev/null) \
|
||||||
|| ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
|
|| ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
|
||||||
|| return 0
|
|| return 0
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
# dashed separator size
|
# dashed separator size
|
||||||
function afmagic_dashes {
|
function afmagic_dashes {
|
||||||
# check either virtualenv or condaenv variables
|
# check either virtualenv or condaenv variables
|
||||||
local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
|
local python_env_dir="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
|
||||||
|
local python_env="${python_env_dir##*/}"
|
||||||
# if there is a python virtual environment and it is displayed in
|
# if there is a python virtual environment and it is displayed in
|
||||||
# the prompt, account for it when returning the number of dashes
|
# the prompt, account for it when returning the number of dashes
|
||||||
if [[ -n "$python_env" && "$PS1" = \(* ]]; then
|
if [[ -n "$python_env" && "$PS1" = \(* ]]; then
|
||||||
|
|
Loading…
Reference in a new issue