psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-16 13:05:35 -05:00
Code Issues Releases Wiki Activity

Fix git-init ahead/behind counts

Browse source
This commit is contained in:
ℳichiel ℛoos 2017-05-10 10:41:24 +02:00 committed by GitHub
parent a7e060a485
commit fdac790840
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/git-info/init.zsh
View file

@ -174,11 +174,9 @@ git-info() {
zstyle -s ':zim:git-info:behind' format 'behind_format'
zstyle -s ':zim:git-info:diverged' format 'diverged_format'
if [[ -n ${ahead_format} || -n ${behind_format} || -n ${diverged_format} ]]; then
# Gets the commit difference counts between local and remote.
local ahead_and_behind_cmd='command git rev-list --count --left-right HEAD...@{upstream}'
# Get ahead and behind counts.
local ahead_and_behind=$(${(z)ahead_and_behind_cmd} 2>/dev/null)
# Get ahead and behind counts from the commit difference counts between local and remote.
local ahead_and_behind
ahead_and_behind=${(z)$(command git rev-list --count --left-right HEAD...@{upstream} 2>/dev/null)}
local ahead=${ahead_and_behind[(w)1]}
local behind=${ahead_and_behind[(w)2]}