Re: [PATCH 2/2] checkout -m: refine autostash fallback
"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 15 quoted lines
> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> 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 <haraldnordgren@gmail.com>
> ---
> builtin/checkout.c | 17 +++++++++++++----
> t/t7201-co.sh | 17 ++++++++++++++++-
> 2 files changed, 29 insertions(+), 5 deletions(-)