From 10ee9e5bd74367dcbf598f27d54ceab43ca68374 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 29 Jan 2022 13:06:50 +0000 Subject: unposted: vcs_info git: Add a missing guard against redefining a function. --- ChangeLog | 3 +++ Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 1 + 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 79fbec278..ff9bc0bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2022-01-29 Daniel Shahaf + * unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Add a missing guard against redefining a function. + * unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: Deconfuse $EDITOR 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 -- cgit 1.4.1