Re: [PATCH 0/2] checkout -m: refine autostash fallback

[Junio C Hamano <gitster@pobox.com>]

"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> Avoiding checkout -m autostash retries when no tracked local changes exist
> and visually separating autostash conflict advice from the subsequent
> branch-switch message.
>
> Addresses #leftoverbits from here:
> https://lore.kernel.org/git/cfd09dbf-8d77-4464-8030-3a0ffb4aeae7@gmail.com/
>
> Harald Nordgren (2):
>   sequencer: teach autostash apply to report conflicts
>   checkout -m: refine autostash fallback
>
>  builtin/checkout.c | 18 ++++++++++++++----
>  builtin/commit.c   |  2 +-
>  builtin/merge.c    |  6 +++---
>  sequencer.c        | 29 +++++++++++++++++++----------
>  sequencer.h        |  3 ++-
>  t/t7201-co.sh      | 17 ++++++++++++++++-
>  6 files changed, 55 insertions(+), 20 deletions(-)
>
>
> base-commit: 9a0c4701dcd5725c4184599322b52933ff5005ca
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2364%2FHaraldNordgren%2Fhn%2Fgit-checkout-m-leftoverbits-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2364/HaraldNordgren/hn/git-checkout-m-leftoverbits-v1
> Pull-Request: https://github.com/git/git/pull/2364

This topic unfortunately has seen no interests from others on the
list.  Asking Phillip for help, as the leftoverbits comment cited in
the cover letter is from him.

Thanks.