diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-01-29 13:06:50 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2022-01-29 16:01:39 +0000 |
| commit | 10ee9e5bd74367dcbf598f27d54ceab43ca68374 (patch) | |
| tree | 0501acffd08eefacaf8cd1c1ae89b48d0214bd54 /Functions | |
| parent | unposted: vcs_info git: Deconfuse $EDITOR (diff) | |
| download | zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar.gz zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar.bz2 zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar.lz zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar.xz zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.tar.zst zsh-10ee9e5bd74367dcbf598f27d54ceab43ca68374.zip | |
unposted: vcs_info git: Add a missing guard against redefining a function.
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index ba588c874..fe084dffb 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -196,6 +196,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then # 'git rebase -i' patchdir="${gitdir}/rebase-merge" local p + (( ${+functions[VCS_INFO_git_map_rebase_line_to_hash_and_subject]} )) || VCS_INFO_git_map_rebase_line_to_hash_and_subject() { local p=$1 unset REPLY |