diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-12-09 01:39:21 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-12-09 01:39:32 +0000 |
| commit | 510df60dd1f90f99026ac17e341df2313e064509 (patch) | |
| tree | 8694cb58d60d59bdb64cd2f46af0db4efb473805 | |
| parent | 7cdada166cd9a05103a838d18e9be9811f68bc1d (diff) | |
| download | zsh-510df60dd1f90f99026ac17e341df2313e064509.tar.gz zsh-510df60dd1f90f99026ac17e341df2313e064509.tar.xz zsh-510df60dd1f90f99026ac17e341df2313e064509.zip | |
51144, 51146: vcs_info git: stg: Extract patch descriptions
Joint work with Peter Grayson.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index dab0a9147..77dfc0377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-12-09 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 51144, 51146: + Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: + stg: Extract patch descriptions + 2022-12-08 Daniel Shahaf <d.s@daniel.shahaf.name> * 51142: 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 37cd048db..9a608adab 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -388,7 +388,7 @@ elif [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]]; then VCS_INFO_git_handle_patches elif command -v stg >/dev/null && ${vcs_comm[cmd]} show-ref --quiet refs/stacks/${gitbranch} refs/heads/${gitbranch}.stgit 2>/dev/null && - git_patches_applied=(${(f)"$(stg series --noprefix --applied 2>/dev/null)"}) + git_patches_applied=(${${(f)"$(stg series --noprefix --applied --description 2>/dev/null)"}/ #[#]}) then # Testing for StGit patches is done after testing for all git-proper # patches/states. If a StGit user's repo is in one of those states, they @@ -408,7 +408,7 @@ then # --no-prefix. The former is compatible with StGit versions going back to # 2008. if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-unapplied; then - git_patches_unapplied=(${(f)"$(stg series --noprefix --unapplied 2>/dev/null)"}) + git_patches_unapplied=(${${(f)"$(stg series --noprefix --unapplied --description 2>/dev/null)"}/ #[#]}) fi VCS_INFO_git_handle_patches else |