diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-01-23 19:06:39 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-01-25 04:22:30 +0000 |
| commit | 57013f8b96520057fda4b0d5057646c83465d1b6 (patch) | |
| tree | 034d0f2652c9d963cc5ccc6fdb5dc9a53b71a97b | |
| parent | b0784025b18a95515c1905be6f7190f4951100e5 (diff) | |
| download | zsh-57013f8b96520057fda4b0d5057646c83465d1b6.tar.gz zsh-57013f8b96520057fda4b0d5057646c83465d1b6.tar.xz zsh-57013f8b96520057fda4b0d5057646c83465d1b6.zip | |
40401: vcs_info git: Fix the %c patch-format expando.
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).
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7d8d19eae..acb4bf464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-01-25 Daniel Shahaf <d.s@daniel.shahaf.name> + * 40401: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix the %c patch-format expando. + * 40396: Doc/Zsh/contrib.yo: vcs_info quilt: More documentation of '%Q' and 'use-quilt'. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 63109aa46..69ed24a2c 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]}" \ |