Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] vcs_info git: Fix the %c patch-format expando.
- X-seq: zsh-workers 40401
- From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: [PATCH] vcs_info git: Fix the %c patch-format expando.
- Date: Mon, 23 Jan 2017 19:06:39 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=ERi jXMFKuFssX9Kcwv5W7Jt8maY=; b=vpvoKlQIZrMqWmc2m8+0+wheg4sz1cZ36H1 sJ2lwYGCzXlzc3aRnlxBHqdGche4jRYPDKLFv6fT/JwQlRcTx9KIQtsYRqfzp3V2 xrTmfCGRs2oDnxhz0rGrR/xJOZ87gUIhG72qsKVb/UYYA3lOZETS/KyvRoyJcl6i JScLdjyo=
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=ER ijXMFKuFssX9Kcwv5W7Jt8maY=; b=QkUqugwSOONhDMEZDXyTLDg6h3p216CxQ4 ZfPYIIBLKZHujytoKSI1KwknmB9yUApMyRgSADON2ix+8fEt655JoZhuOeah5b51 91qob93zv0oR/ixL4Jw7G1hY2UD4ufEA9cpbeKkjERpJuBDa58oNKinmQXLaOxqA Wknd0PRqg=
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
Before this change, ${git_unapplied_s} was unused and the %c
(${hook_com[unapplied]}) expando evaluated to the number of digits in
the string returned by the gen-unapplied-string hook (or to the number
of digits in the number of unapplied patches, when there was no such
hook).
---
I've noticed that the *-n hook_com keys are undocumented, but leaving that for
another day...
Cheers,
Daniel
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 4ec87c6..efb77b7 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -136,9 +136,9 @@ VCS_INFO_git_handle_patches () {
fi
hook_com=()
if VCS_INFO_hook 'gen-unapplied-string' "${git_patches_unapplied[@]}"; then
- git_patches_unapplied=${#git_patches_unapplied}
+ git_unapplied_s=${#git_patches_unapplied}
else
- git_patches_unapplied=${hook_com[unapplied-string]}
+ git_unapplied_s=${hook_com[unapplied-string]}
fi
if (( ${#git_patches_applied} )); then
@@ -146,7 +146,7 @@ VCS_INFO_git_handle_patches () {
else
zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" nopatch-format gitmsg || gitmsg="no patch applied"
fi
- hook_com=( applied "${git_applied_s}" unapplied "${git_patches_unapplied}"
+ hook_com=( applied "${git_applied_s}" unapplied "${git_unapplied_s}"
applied-n ${#git_patches_applied} unapplied-n ${#git_patches_unapplied} all-n ${git_all} )
if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then
zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
Messages sorted by:
Reverse Date,
Date,
Thread,
Author