mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-04 06:36:18 +02:00
Code

51142: vcs_info git: Check the get-unapplied style as documented 

The style was treated as "always true" rather than as "settable, false
by default" in the rebase-merge and cherry-pick cases.  This affects the
gen-unapplied-string hook, and may also affect gen-applied-string and
set-patch-format hooks if they accessed VCS_INFO_get_data_git's internal
parameters directly.

If this affects you, just set the style in your zshrc:
.
    zstyle ':vcs_info:git*:*:*' get-unapplied true
This commit is contained in:
Daniel Shahaf 2022-12-08 21:59:25 +00:00
parent ca7c42e1ee
commit 7cdada166c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2022-12-08 Daniel Shahaf <d.s@daniel.shahaf.name>
* 51142: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Check the get-unapplied style as documented
2022-12-08 Peter Grayson <pete@jpgrayson.net>
* 51138: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:

8
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View File

@ -244,7 +244,9 @@ if [[ -d "${gitdir}/rebase-merge" ]]; then
(( $+REPLY )) && git_patches_applied+=( "$REPLY" )
done
fi
if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-unapplied &&
[[ -f "${patchdir}/git-rebase-todo" ]]
then
for p in ${(f)"$(< "${patchdir}/git-rebase-todo")"}; do
VCS_INFO_git_map_rebase_line_to_hash_and_subject "$p"
(( $+REPLY )) && git_patches_unapplied+=( "$REPLY" )
@ -374,7 +376,9 @@ elif [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]]; then
# TODO: maybe read up to the first blank line
IFS='' read -r subject < "${gitdir}/MERGE_MSG"
git_patches_applied=( "$(<${gitdir}/CHERRY_PICK_HEAD) ${subject}" )
if [[ -f "${gitdir}/sequencer/todo" ]]; then
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-unapplied &&
[[ -f "${gitdir}/sequencer/todo" ]]
then
# Get the next patches, and remove the one that's in CHERRY_PICK_HEAD.
git_patches_unapplied=( ${${(M)${(f)"$(<"${gitdir}/sequencer/todo")"}:#pick *}#pick } )
git_patches_unapplied[1]=()