diff --git a/ChangeLog b/ChangeLog
index 6364ed067..a7658fbcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-20  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 48528/0001: Misc/vcs_info-examples: vcs_info git docs:
+	ahead/behind commits: Don't run rev-list when that would fail
+
 2021-04-19  Bart Schaefer  <schaefer@zsh.org>
 
 	* 48617: Completion/Base/Widget/_complete_debug: fix misuse of
diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples
index d33d0ceed..065ea6cb3 100644
--- a/Misc/vcs_info-examples
+++ b/Misc/vcs_info-examples
@@ -179,6 +179,9 @@ function +vi-git-st() {
     local ahead behind
     local -a gitstatus
 
+    # Exit early in case the worktree is on a detached HEAD
+    git rev-parse ${hook_com[branch]}@{upstream} >/dev/null 2>&1 || return 0
+
     ahead=$(git rev-list --count ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null)
     (( $ahead )) && gitstatus+=( "+${ahead}" )