From 7cdada166cd9a05103a838d18e9be9811f68bc1d Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Thu, 8 Dec 2022 21:59:25 +0000
Subject: [PATCH] 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
---
ChangeLog | 5 +++++
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 63e9c5041..dab0a9147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 23d4d31a1..37cd048db 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -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]=()