Re: switch/checkout stops halfway when it fails to write tracking config
- From
D. Ben Knoble <ben.knoble@gmail.com>
- Date
- Oct 22, 2026, 12:48 UTC
- Message-ID
- <CALnO6CB=tmTrNKcWOanb79Bm9gPT5H_dntNGRJGp6iEYHe_aBg@mail.gmail.com>
- In-Reply-To
- <CAP8tz2+CQcQyTdj3YFpEaiVh=hVoK5Xo8WFxGZNMJoCCM-u=hQ@mail.gmail.com>
On Tue, Oct 20, 2026 at 11:09 AM 井上司 <inoue.tsukasa.4@gmail.com> wrote:
Show 11 quoted lines
> > > I can see where create_branch() is called prior to setting up HEAD, > > but I'm mildly confused about the index/wt updates prior to either! It > > seems to me that should be one of the last steps, hm. Unfortunately, > > I'm having a hard time finding the responsible code outside of the > > "merge" case (which probably has a similar issue). > > > - merge_working_tree() updates the worktree and the index. It is called > from switch_branches() on every branch switch, not only with -m, > because do_merge starts at 1.
Ah, thanks, I think that's what I overlooked. I wonder if it's a royal pain to make that step and the index step come later in the sequence? But that is more of a band-aid than a proper atomicity fix.
Show 15 quoted lines
> - The "merge" here is not -m. It is the 2-way merge in unpack_trees(). > -m only adds an autostash step for when that 2-way merge fails. > - The order is: update the worktree, create the ref, write the tracking > config (which fails), then update HEAD. As you noticed, the worktree > and index are updated before the ref and HEAD, so a failure later > leaves those changes in place. > - As you guessed, the -m case has the same problem. I tried > "git switch -m -c y origin/main" with the lock present (v2.56.0 plus > my hint patch, which only changes the hint text). It stops in the same > place. If local changes conflict, HEAD stays on main, the file is left > conflicted, and the changes remain in the stash. > - Running the same command again in that conflicted state stops with > "a branch named 'y' already exists". Switching to the existing branch > y stops with "you need to resolve your current index first" > (checkout.c:887 in v2.56.0). Neither run changes the state.
[trimmed repeated quoted content]
-- D. Ben Knoble