mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

unposted: vcs_info git: Add a missing guard against redefining a function.

Browse source
This commit is contained in:
Daniel Shahaf 2022-01-29 13:06:50 +00:00
parent 42f1e99f81
commit 10ee9e5bd7
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2022-01-29 Daniel Shahaf <d.s@daniel.shahaf.name>
* 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

1
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -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