mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-09-28 15:01:21 +02:00
43619: vcs_info git: In non-interactive rebases, always set $hook_com[git_patches_applied] to a string of the form 'foo bar', never just 'foo'.
This commit is contained in:
parent
a05533e425
commit
0e0219118d
@ -1,5 +1,10 @@
|
||||
2018-10-08 Daniel Shahaf <d.s@daniel.shahaf.name>
|
||||
|
||||
* 43619: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
|
||||
vcs_info git: In non-interactive rebases, always set
|
||||
$hook_com[git_patches_applied] to a string of the form 'foo bar',
|
||||
never just 'foo'.
|
||||
|
||||
* 43618: Functions/VCS_Info/Backends/VCS_INFO_detect_p4,
|
||||
Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr,
|
||||
Functions/VCS_Info/Backends/VCS_INFO_get_data_git,
|
||||
|
@ -260,18 +260,11 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then
|
||||
subject=$REPLY
|
||||
}
|
||||
fi
|
||||
subject=${subject:-'?'}
|
||||
if [[ -f "${patchdir}/original-commit" ]]; then
|
||||
if [[ -n $subject ]]; then
|
||||
git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
|
||||
else
|
||||
git_patches_applied+=("$(< ${patchdir}/original-commit)")
|
||||
fi
|
||||
git_patches_applied+=("$(< ${patchdir}/original-commit) $subject")
|
||||
else
|
||||
if [[ -n $subject ]]; then
|
||||
git_patches_applied+=("? $subject")
|
||||
else
|
||||
git_patches_applied+=("?")
|
||||
fi
|
||||
git_patches_applied+=("? $subject")
|
||||
fi
|
||||
local last="$(< "${patchdir}/last")"
|
||||
if (( cur+1 <= last )); then
|
||||
|
Loading…
Reference in New Issue
Block a user