diff --git a/ChangeLog b/ChangeLog
index 79fbec278..ff9bc0bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 
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