From: Junio C Hamano Date: Tue, 28 Jul 2026 22:49:20 GMT Subject: Re: [PATCH 2/2] checkout -m: refine autostash fallback Message-ID: In-Reply-To: <37becf38c2ef175a3dadcf750e2cca836942d83e.1784993669.git.gitgitgadget@gmail.com> "Harald Nordgren via GitGitGadget" writes: > From: Harald Nordgren > > When unpack_trees() fails under "git checkout -m", only create an > autostash and retry if there are tracked local changes. Without such > changes, the fallback cannot help and merely repeats the same failure. > > Use the conflict result from apply_autostash_ref() to print a blank line > before the branch-switch message, visually separating it from the > conflict advice. > > Signed-off-by: Harald Nordgren > --- > builtin/checkout.c | 17 +++++++++++++---- > t/t7201-co.sh | 17 ++++++++++++++++- > 2 files changed, 29 insertions(+), 5 deletions(-) Thanks. Will queue.