Re: [PATCH v2 0/3] checkout: finish switch when tracking config cannot be written

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

"tsukasa-ino via GitGitGadget" <gitgitgadget@gmail.com> writes:

> When the tracking config cannot be written (for example, because
> .git/config.lock exists), git switch -c and checkout -b stop halfway. The
> worktree, the index and the new branch ref are already updated, but HEAD
> stays on the old branch, and the changes are left staged. The hint printed
> at that point was also wrong: it suggested origin/refs/heads/.
>
> 1/3 strips refs/heads/ from the hint. 2/3 makes setup_tracking() return an
> error instead of calling exit(). No behavior change yet. 3/3 makes switch
> and checkout finish the switch and exit with status 0, as push -u, clone and
> fetch already do. git branch still fails.
>
> Changes since v1:
>
>  * 1/3: the test now compares the whole hint message, as suggested by Harald
>    Nordgren. It also checks that the command in the hint works once the lock
>    is removed, as suggested by Junio
>    (https://lore.kernel.org/git/xmqq7bjcup46.fsf@gitster.g/).

OK.

>  * 2/3 and 3/3 are new. They implement the direction agreed on the bug
>    report thread (https://lore.kernel.org/git/xmqqecdjsryk.fsf@gitster.g/).

I am not sure if these two should be part of the same topic as the
first one, or they should be treated separately.  IOW, if the way
these two patches implement the fix proves to be contentious, does
it make sense to hold the change in 1/3 until 2&3/3 are resolved
(and vice versa), or can they be treated as two separate issues?

> Making the switch fully atomic, so that a failure undoes the worktree, the
> index, the ref and the config, is left for a separate topic.

Sensible.