From: Harald Nordgren <haraldnordgren@gmail•com>
To: gitgitgadget@gmail•com
Cc: git@vger•kernel.org, haraldnordgren@gmail•com
Subject: Re: [PATCH] checkout: add --autostash option for branch switching
Date: Sat, 14 Mar 2026 10:16:18 +0100 [thread overview]
Message-ID: <20260314091618.88072-1-haraldnordgren@gmail.com> (raw)
In-Reply-To: <pull.2239.git.git.1773479526823.gitgitgadget@gmail.com>
>> Harald Nordgren (2):
>> refactor format_branch_comparison in preparation
>> status: show comparison with push remote tracking branch
>>
>> remote.c | 183 ++++++++++++++++++++-------
>> t/t6040-tracking-info.sh | 262 +++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 403 insertions(+), 42 deletions(-)
>>
>>
>> base-commit: d529f3a197364881746f558e5652f0236131eb86
>> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2138%2FHaraldNordgren%2Fahead_of_main_status-v20
>> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2138/HaraldNordgren/ahead_of_main_status-v20
>> Pull-Request: https://github.com/git/git/pull/2138
>>
>> Range-diff vs v19:
>>
>> 1: 451d7a4986 ! 1: bb3e00863b refactor format_branch_comparison in preparation
>> @@ remote.c: int format_tracking_info(struct branch *branch, struct strbuf *sb,
>> if (advice_enabled(ADVICE_STATUS_HINTS))
>> strbuf_addstr(sb,
>> _(" (use \"git pull\" to update your local branch)\n"));
>> -@@ remote.c: int format_tracking_info(struct branch *branch, struct strbuf *sb,
>> - "and have %d and %d different commits each, "
>> - "respectively.\n",
>> - ours + theirs),
>> + } else {
>> + strbuf_addf(sb,
>> +- Q_("Your branch and '%s' have diverged,\n"
>> +- "and have %d and %d different commit each, "
>> +- "respectively.\n",
>> +- "Your branch and '%s' have diverged,\n"
>> +- "and have %d and %d different commits each, "
>> +- "respectively.\n",
>> +- ours + theirs),
>> - base, ours, theirs);
>> ++ "Your branch and '%s' have diverged,\n"
>> ++ "and have %d and %d different commits each, respectively.\n",
>> + branch_name, ours, theirs);
>> if (show_divergence_advice &&
>> advice_enabled(ADVICE_STATUS_HINTS))
>
> Could you not mix the ours+theirs thing into the same step? Either
> make it a standalone patch to clean up before or after your main 2
> patches, or leave it totally outside the series and send it after
> this series settles.
Making a change that was left out of https://lore.kernel.org/git/xmqqzf6lqs9w.fsf@gitster.g/
Harald
next prev parent reply other threads:[~2026-03-14 9:16 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-14 9:12 [PATCH] remote: use plural-only message for diverged branch status Harald Nordgren via GitGitGadget
2026-03-14 9:16 ` Harald Nordgren [this message]
2026-03-14 16:52 ` Junio C Hamano
2026-03-14 18:38 ` Junio C Hamano
2026-03-14 20:08 ` Phillip Wood
2026-03-15 2:08 ` Junio C Hamano
2026-03-16 10:49 ` Phillip Wood
2026-03-16 17:06 ` Junio C Hamano
2026-03-25 4:29 ` Kaartic Sivaraam
-- strict thread matches above, loose matches on Subject: below --
2026-05-03 22:39 [PATCH] fetch: add fetch.pruneLocalBranches config Junio C Hamano
2026-05-04 18:28 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-05-10 1:01 ` Junio C Hamano
2026-05-03 20:59 [PATCH v5] checkout: extend --track with a "fetch" mode to refresh start-point Junio C Hamano
2026-05-03 22:32 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-29 10:02 [PATCH v16 0/5] checkout: 'autostash' " Phillip Wood
2026-04-29 11:11 ` [PATCH] checkout: add --autostash option " Harald Nordgren
2026-04-28 9:35 [PATCH v15 5/5] checkout -m: autostash when switching branches Phillip Wood
2026-04-28 18:08 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-28 9:33 [PATCH v15 3/5] sequencer: teach autostash apply to take optional conflict marker labels Phillip Wood
2026-04-28 15:21 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-28 9:32 [PATCH v15 1/5] stash: add --label-ours, --label-theirs, --label-base for apply Phillip Wood
2026-04-28 15:16 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-15 16:24 [PATCH v14 0/5] checkout: 'autostash' " Harald Nordgren via GitGitGadget
2026-04-21 7:53 ` [PATCH] checkout: add --autostash option " Harald Nordgren
2026-04-21 9:34 ` Phillip Wood
2026-04-22 17:58 ` Harald Nordgren
2026-04-14 15:56 [PATCH v12 0/4] checkout: 'autostash' " Junio C Hamano
2026-04-14 20:16 ` [PATCH] checkout: add --autostash option " Harald Nordgren
2026-04-14 20:56 ` Junio C Hamano
2026-04-16 10:05 ` Harald Nordgren
2026-04-16 14:45 ` Junio C Hamano
2026-04-16 17:53 ` Harald Nordgren
2026-04-14 14:07 [PATCH v12 4/4] checkout: -m (--merge) uses autostash when switching branches Phillip Wood
2026-04-14 20:06 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-15 9:35 ` Phillip Wood
2026-04-14 20:13 ` Harald Nordgren
2026-04-15 8:19 ` Harald Nordgren
2026-04-15 9:34 ` Phillip Wood
2026-04-15 8:16 ` Harald Nordgren
2026-04-15 9:36 ` Phillip Wood
2026-04-14 14:06 [PATCH v12 3/4] sequencer: teach autostash apply to take optional conflict marker labels Phillip Wood
2026-04-14 18:44 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-14 14:06 [PATCH v12 2/4] sequencer: allow create_autostash to run silently Phillip Wood
2026-04-14 18:35 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-14 14:05 [PATCH v12 1/4] stash: add --label-ours, --label-theirs, --label-base for apply Phillip Wood
2026-04-14 18:56 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-14 20:08 ` Harald Nordgren
2026-04-15 9:34 ` Phillip Wood
2026-04-15 15:34 ` Harald Nordgren
2026-04-13 22:45 [PATCH v10 0/4] checkout: 'autostash' " Junio C Hamano
2026-04-14 7:29 ` [PATCH] checkout: add --autostash option " Harald Nordgren
2026-04-14 13:29 ` Junio C Hamano
2026-04-14 14:14 ` Junio C Hamano
2026-04-14 17:42 ` Junio C Hamano
2026-04-11 18:38 [PATCH v9 4/4] checkout: -m (--merge) uses autostash when switching branches Jeff King
2026-04-11 18:51 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-11 19:11 ` Jeff King
2026-04-10 16:34 [PATCH v8 3/4] sequencer: teach autostash apply to take optional conflict marker labels Junio C Hamano
2026-04-10 18:48 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-10 15:39 [PATCH v8 2/4] sequencer: allow create_autostash to run silently Phillip Wood
2026-04-10 18:53 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-10 15:39 [PATCH v8 1/4] stash: add --ours-label, --theirs-label, --base-label for apply Phillip Wood
2026-04-10 19:18 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-09 23:49 [PATCH v8 4/4] checkout: -m (--merge) uses autostash when switching branches Chris Torek
2026-04-10 14:38 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-09 17:55 [PATCH v7 4/4] checkout: -m (--merge) uses autostash when switching branches Junio C Hamano
2026-04-09 20:32 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-09 17:32 [PATCH v7 3/4] sequencer: teach autostash apply to take optional conflict marker labels Junio C Hamano
2026-04-09 21:20 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-09 17:25 [PATCH v7 1/4] stash: add --ours-label, --theirs-label, --base-label for apply Junio C Hamano
2026-04-09 20:31 ` [PATCH] checkout: add --autostash option for branch switching Harald Nordgren
2026-04-09 17:00 [PATCH v7 0/4] checkout: 'autostash' " Junio C Hamano
2026-04-09 21:23 ` [PATCH] checkout: add --autostash option " Harald Nordgren
2026-03-13 17:16 [PATCH v3] " Junio C Hamano
2026-03-13 19:33 ` [PATCH] " Harald Nordgren
2026-03-13 20:30 ` Junio C Hamano
2026-03-12 19:50 [PATCH v2] " Junio C Hamano
2026-03-13 9:22 ` [PATCH] " Harald Nordgren
2026-03-12 13:26 Harald Nordgren via GitGitGadget
2026-03-12 14:40 ` Junio C Hamano
2026-03-13 14:29 ` Phillip Wood
2026-03-14 17:17 ` Junio C Hamano
2026-03-16 16:36 ` Phillip Wood
2026-03-16 20:04 ` Junio C Hamano
2026-03-17 9:47 ` Harald Nordgren
2026-03-19 8:25 ` Harald Nordgren
2026-03-19 16:48 ` Junio C Hamano
2026-03-31 12:16 ` Harald Nordgren
2026-04-09 11:50 ` Harald Nordgren
2026-04-09 12:06 ` Harald Nordgren
2026-04-09 18:35 ` Junio C Hamano
2026-04-09 21:29 ` Harald Nordgren
2026-04-09 12:12 ` Harald Nordgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260314091618.88072-1-haraldnordgren@gmail.com \
--to=haraldnordgren@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox