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

unposted: Indicate which use-case each branch handles.

Browse source
This commit is contained in:
Daniel Shahaf 2018-10-02 15:21:53 +00:00
parent 6a5c38626b
commit f9952301b2
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2018-10-02 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
Indicate which use-case each branch handles.
* unposted: Doc/Zsh/contrib.yo: Fix typo
2018-09-30 Daniel Shahaf <d.s@daniel.shahaf.name>

4
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -183,6 +183,7 @@ then
git_patches_unapplied=(${(f)"$(< "${patchdir}/unapplied")"})
VCS_INFO_git_handle_patches
elif [[ -d "${gitdir}/rebase-merge" ]]; then
# 'git rebase -i'
patchdir="${gitdir}/rebase-merge"
local p
[[ -f "${patchdir}/done" ]] &&
@ -199,12 +200,13 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
fi
VCS_INFO_git_handle_patches
elif [[ -d "${gitdir}/rebase-apply" ]]; then
# Fake patch names for all but current patch
# 'git rebase' without -i
patchdir="${gitdir}/rebase-apply"
local next="${patchdir}/next"
if [[ -f $next ]]; then
local cur=$(< $next)
local p subject
# Fake patch names for all but current patch
for ((p = 1; p < cur; p++)); do
printf -v "git_patches_applied[$p]" "%04d ?" "$p"
done