From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Tue, 06 Jan 2026 00:08:14 GMT
Subject: ABQ
Message-ID: <20260106000814.58893-1-haraldnordgren@gmail.com>
In-Reply-To: <xmqq5x9flndb.fsf@gitster.g>

Note that this change also makes tests fail on the 'master' branch, so not
an issue introdued by my code:

```
diff --git a/remote.c b/remote.c
index 59b3715120..f84f2747b2 100644
--- a/remote.c
+++ b/remote.c
@@ -2265,7 +2265,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addstr(sb,
 				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
-	} else if (!sti) {
+	} else if (!ours && !theirs) {
 		strbuf_addf(sb,
 			_("Your branch is up to date with '%s'.\n"),
 			base);
```

If you have the time, it might be interesting to run
'./t6040-tracking-info.sh' and to see what happens for the different cases.

It's failing for the ABQ cases, maybe because of this:

```
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
```

I would argue this is getting outside of the scope of push branch
comparison, so maybe better to do this as a follow-up? What do you say?


Harald