Show commits ahead of upstream and behind upstream in git prompt

NonlinearFruit · NonlinearFruit · commit e8c68ca62a26 · 2026-04-25T07:03:55.000-06:00
diff --git a/scripts/git-prompt b/scripts/git-prompt
@@ -30,7 +30,8 @@ changes() {
   STAGED="$(git diff --cached --name-only 2>/dev/null | wc --lines)s"
   WORKTREE="$(git diff --name-only 2>/dev/null | wc --lines)w"
   UNTRACKED="$(git ls-files --others  --exclude-standard 2>/dev/null | wc --lines)u"
-  echo "${STAGED}${WORKTREE}${UNTRACKED}" | sed -E ':1; s/(^|[^0-9])0[swu]/\1/g; t1;'
+  AHEAD_BEHIND="$(git rev-list --left-right --count @...@{u} | sed -E 's/^([0-9]+)/\1a/; s/\s+([0-9]+)$/\1b/')"
+  echo "${STAGED}${WORKTREE}${UNTRACKED}${AHEAD_BEHIND}" | sed -E ':1; s/(^|[^0-9])0[swuab]/\1/g; t1;'
 }
 
 if ! is_git_repo; then

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ changes() {`
`30`	`30`	`STAGED="$(git diff --cached --name-only 2>/dev/null \| wc --lines)s"`
`31`	`31`	`WORKTREE="$(git diff --name-only 2>/dev/null \| wc --lines)w"`
`32`	`32`	`UNTRACKED="$(git ls-files --others --exclude-standard 2>/dev/null \| wc --lines)u"`
`33`		`- echo "${STAGED}${WORKTREE}${UNTRACKED}" \| sed -E ':1; s/(^\|[^0-9])0[swu]/\1/g; t1;'`
	`33`	`+ AHEAD_BEHIND="$(git rev-list --left-right --count @...@{u} \| sed -E 's/^([0-9]+)/\1a/; s/\s+([0-9]+)$/\1b/')"`
	`34`	`+ echo "${STAGED}${WORKTREE}${UNTRACKED}${AHEAD_BEHIND}" \| sed -E ':1; s/(^\|[^0-9])0[swuab]/\1/g; t1;'`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`if ! is_git_repo; then`