mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

37612: vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.

Browse source 
This manifested, e.g., in 'git am' of a single patch that had a conflict.
This commit is contained in:
Daniel Shahaf 2016-01-14 00:13:43 +00:00
parent 06ea248034
commit ce1148db45
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2016-01-15 Daniel Shahaf <d.s@daniel.shahaf.name>
* 37612: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Set $git_patches_unapplied correctly for
'rebase-apply' case.
2016-01-14 Daniel Shahaf <d.s@daniel.shahaf.name>
* 37590: Src/Zle/zle_hist.c, Src/Zle/zle_main.c: Invoke

4
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -247,7 +247,9 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
fi
fi
local last="$(< "${patchdir}/last")"
git_patches_unapplied=( {$cur..$last} )
if (( cur+1 <= last )); then
git_patches_unapplied=( {$((cur+1))..$last} )
fi
fi
VCS_INFO_git_handle_patches