mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-11 00:00:06 +00:00
s/CONFLICTING/CONFLICTED/ for consistency; see #221
This commit is contained in:
parent
e470bbfe11
commit
79e0190ba1
1 changed files with 6 additions and 6 deletions
|
@ -2160,7 +2160,7 @@ typeset -gA __p9k_vcs_states=(
|
|||
'MODIFIED' '3'
|
||||
'UNTRACKED' '2'
|
||||
'LOADING' '8'
|
||||
'CONFLICTING' '3'
|
||||
'CONFLICTED' '3'
|
||||
)
|
||||
|
||||
function +vi-git-untracked() {
|
||||
|
@ -2442,8 +2442,8 @@ function _p9k_vcs_render() {
|
|||
|
||||
if (( _POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING )); then
|
||||
if [[ -z $state ]]; then
|
||||
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTING_STATE == 1 ]]; then
|
||||
state=CONFLICTING
|
||||
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then
|
||||
state=CONFLICTED
|
||||
elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
|
||||
state=MODIFIED
|
||||
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
|
||||
|
@ -2495,8 +2495,8 @@ function _p9k_vcs_render() {
|
|||
local content
|
||||
|
||||
if (( ${_POWERLEVEL9K_VCS_GIT_HOOKS[(I)vcs-detect-changes]} )); then
|
||||
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTING_STATE == 1 ]]; then
|
||||
: ${state:=CONFLICTING}
|
||||
if [[ $VCS_STATUS_HAS_CONFLICTED == 1 && $_POWERLEVEL9K_VCS_CONFLICTED_STATE == 1 ]]; then
|
||||
: ${state:=CONFLICTED}
|
||||
elif [[ $VCS_STATUS_HAS_STAGED != 0 || $VCS_STATUS_HAS_UNSTAGED != 0 ]]; then
|
||||
: ${state:=MODIFIED}
|
||||
elif [[ $VCS_STATUS_HAS_UNTRACKED != 0 ]]; then
|
||||
|
@ -3589,7 +3589,7 @@ _p9k_init_params() {
|
|||
_p9k_declare -i POWERLEVEL9K_VCS_SHORTEN_MIN_LENGTH
|
||||
_p9k_declare -s POWERLEVEL9K_VCS_SHORTEN_STRATEGY
|
||||
_p9k_declare -e POWERLEVEL9K_VCS_SHORTEN_DELIMITER '\u2026'
|
||||
_p9k_declare -b POWERLEVEL9K_VCS_CONFLICTING_STATE 0
|
||||
_p9k_declare -b POWERLEVEL9K_VCS_CONFLICTED_STATE 0
|
||||
_p9k_declare -b POWERLEVEL9K_HIDE_BRANCH_ICON 0
|
||||
_p9k_declare -b POWERLEVEL9K_VCS_HIDE_TAGS 0
|
||||
_p9k_declare -i POWERLEVEL9K_CHANGESET_HASH_LENGTH 8
|
||||
|
|
Loading…
Reference in a new issue