Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git-plugin: Don't truncate commit number #41

Closed
wants to merge 1 commit into from
Closed

Git-plugin: Don't truncate commit number #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions plugins/git/functions/git-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ function git-info() {
local branch_info
local branch_format
local branch_formatted
local branch_is_set
local clean
local clean_formatted
local commit
local commit_short
local commit_format
local deleted=0
local deleted_format
Expand Down Expand Up @@ -219,9 +219,8 @@ function git-info() {
commit="$(git rev-parse HEAD 2>/dev/null)"

# Format commit (short).
commit_short="$commit[1,7]"
zstyle -s ':omz:plugin:git:prompt' commit 'commit_format'
zformat -f commit_formatted "$commit_format" "c:$commit_short"
zformat -f commit_formatted "$commit_format" "c:$commit"

# Stashed
if [[ -f "$(_git-dir)/refs/stash" ]]; then
Expand All @@ -237,9 +236,6 @@ function git-info() {
(( line_number++ ))

if (( line_number == 1 )) && [[ "$line" == *'(no branch)'* ]]; then
# Set branch to commit (short) when the branch is not found.
branch="$commit_short"

# Get action.
action="$(_git-action)"
if [[ -n "$action" ]]; then
Expand Down Expand Up @@ -298,6 +294,7 @@ function git-info() {
# Format branch.
zstyle -s ':omz:plugin:git:prompt' branch 'branch_format'
zformat -f branch_formatted "$branch_format" "b:$branch"
branch_is_set=$#branch

# Format remote.
if [[ "$branch" != "$commit" ]]; then
Expand Down Expand Up @@ -379,6 +376,7 @@ function git-info() {
"c:$commit_formatted" \
"d:$deleted_formatted" \
"D:$dirty_formatted" \
"h:$branch_is_set" \
"m:$modified_formatted" \
"R:$remote_formatted" \
"r:$renamed_formatted" \
Expand Down
4 changes: 2 additions & 2 deletions themes/sorin/prompt_sorin_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ function prompt_sorin_setup() {
zstyle ':omz:plugin:git:prompt' deleted ' %%B%F{red}✖%f%%b'
zstyle ':omz:plugin:git:prompt' modified ' %%B%F{blue}✱%f%%b'
zstyle ':omz:plugin:git:prompt' renamed ' %%B%F{magenta}➜%f%%b'
zstyle ':omz:plugin:git:prompt' commit '%c'
zstyle ':omz:plugin:git:prompt' commit '%.7c'
zstyle ':omz:plugin:git:prompt' stashed ' %%B%F{cyan}✭%f%%b'
zstyle ':omz:plugin:git:prompt' unmerged ' %%B%F{yellow}═%f%%b'
zstyle ':omz:plugin:git:prompt' untracked ' %%B%F{white}◼%f%%b'
zstyle ':omz:plugin:git:prompt' prompt ' %F{blue}git%f%b%s'
zstyle ':omz:plugin:git:prompt' prompt ' %F{blue}git%f%0(h.%c.%b)%s'
zstyle ':omz:plugin:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u'

PROMPT='%F{cyan}%1~%f${git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
Expand Down