mirror of
https://github.com/sorin-ionescu/prezto.git
synced 2025-01-23 08:02:16 +08:00
Compare commits
6 Commits
2826f56bc5
...
5161f3dc62
Author | SHA1 | Date | |
---|---|---|---|
|
5161f3dc62 | ||
|
427268c64f | ||
|
61d7dc9a72 | ||
|
2388b8f873 | ||
|
9626ce2beb | ||
|
da3dce98bb |
@ -1 +1 @@
|
|||||||
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
|
Subproject commit e52ee8ca55bcc56a17c828767a3f98f22a68d4eb
|
@ -1 +1 @@
|
|||||||
Subproject commit 978e79e12c44b5b1d3e1e2920c537002087b82c2
|
Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96
|
@ -149,6 +149,9 @@ function git-info {
|
|||||||
local dirty=0
|
local dirty=0
|
||||||
local dirty_format
|
local dirty_format
|
||||||
local dirty_formatted
|
local dirty_formatted
|
||||||
|
local tracked=0
|
||||||
|
local tracked_format
|
||||||
|
local tracked_formatted
|
||||||
local ignore_submodules
|
local ignore_submodules
|
||||||
local indexed=0
|
local indexed=0
|
||||||
local indexed_format
|
local indexed_format
|
||||||
@ -413,6 +416,13 @@ function git-info {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Format tracked.
|
||||||
|
(( tracked = dirty - untracked ))
|
||||||
|
if (( tracked > 0 )); then
|
||||||
|
zstyle -s ':prezto:module:git:info:tracked' format 'tracked_format'
|
||||||
|
zformat -f tracked_formatted "$tracked_format" "t:$tracked"
|
||||||
|
fi
|
||||||
|
|
||||||
# Format dirty and clean.
|
# Format dirty and clean.
|
||||||
if (( dirty > 0 )); then
|
if (( dirty > 0 )); then
|
||||||
zstyle -s ':prezto:module:git:info:dirty' format 'dirty_format'
|
zstyle -s ':prezto:module:git:info:dirty' format 'dirty_format'
|
||||||
@ -447,6 +457,7 @@ function git-info {
|
|||||||
"s:$action_formatted" \
|
"s:$action_formatted" \
|
||||||
"S:$stashed_formatted" \
|
"S:$stashed_formatted" \
|
||||||
"U:$unmerged_formatted" \
|
"U:$unmerged_formatted" \
|
||||||
|
"t:$tracked_formatted" \
|
||||||
"u:$untracked_formatted"
|
"u:$untracked_formatted"
|
||||||
git_info[$info_format]="$REPLY"
|
git_info[$info_format]="$REPLY"
|
||||||
done
|
done
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8dd05bfcc12b0cd1ee9ea64be725b3d9f713cf64
|
Subproject commit 87ce96b1862928d84b1afe7c173316614b30e301
|
@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
|
|||||||
_tmux_iterm_integration='-CC'
|
_tmux_iterm_integration='-CC'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
|
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_RESOLVING_ENVIRONMENT" && "$TERM_PROGRAM" != "vscode" && "$TERMINAL_EMULATOR" != "JetBrains-JediTerm" ]] && ( \
|
||||||
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
|
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
|
||||||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
|
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
|
||||||
); then
|
); then
|
||||||
|
Loading…
Reference in New Issue
Block a user