git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/6] status: say when the push branch was rebased cleanly

From
AGAniket Gupta <aniketgupta3001@gmail.com>
Date
Nov 20, 2026, 19:02 UTC
Message-ID
<20261120190246.79249-1-aniketgupta3001@gmail.com>
In-Reply-To
<dc0efefa0ef02a04f211cf7e24a8b6855f36e12f.1791270504.git.gitgitgadget@gmail.com>
Hi Harald,
Thanks for working on this.
> +	if (num_same)
> +		strvec_push(&argv, "--cherry-mark");

This makes git status slower when the branches have diverged as every commit on both sides now needs a patch id. With status.compareBranches = @{upstream} @{push} and 3000 commits on both side the status goes from 25ms to 150ms. With 10000, it goes from 60ms to 500ms. And with only @{upstream} it stays the same.

Would it make sense to count without --cherry-mark first and only run the patch id pass when the two counts are small?

Previous: Harald Nordgren via GitGitGadgetNext: Harald Nordgren
Message 4 of 11 in “status, push: handle a push branch rebased onto a newer upstream”
  1. 0/6 status, push: handle a push branch rebased onto a newer upstreamHarald Nordgren via GitGitGadget, Oct 6, 2026
  2. 1/6 status: count push divergence outside the upstreamHarald Nordgren via GitGitGadget, Oct 6, 2026
  3. 2/6 status: say when the push branch was rebased cleanlyHarald Nordgren via GitGitGadget, Oct 6, 2026
  4. Aniket GuptaNov 20, 2026
  5. Harald NordgrenNov 20, 2026
  6. Aniket GuptaNov 21, 2026
  7. 3/6 status: suggest a force push after a clean rebaseHarald Nordgren via GitGitGadget, Oct 6, 2026
  8. 4/6 push: name the branch to pull from when it is not the upstreamHarald Nordgren via GitGitGadget, Oct 6, 2026
  9. 5/6 push: offer a force push after rewriting pushed commitsHarald Nordgren via GitGitGadget, Oct 6, 2026
  10. 6/6 push: suggest a force push after a clean rebaseHarald Nordgren via GitGitGadget, Oct 6, 2026
  11. Harald NordgrenNov 14, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.