Branch of the main branch is changed in case of the worktree

[andrii0lomakin]

While working with git-machete on the worktree, I noticed that the main branch of the feature chain changed (it was checked out in a non-current directory) during the execution of the traverse command. However, it was not rolled back after execution finished, which can lead to unexpected side effects.

It would be good if traverse returned to the original branch at the end of the command execution

[PawelLipski]

Branch of the main branch is changed

Hmm could you explain the exact problem here? Do you mean that the worktree where the main (root?) branch of the chain is checked out has changed? I.e. before the traversal the main branch was checked out in worktree A, and after the traversal it was unexpectedly checked out in worktree B?
Or alternatively, is the problem about the commit pointed by the main branch changing unexpectedly after the traversal?
Or even more surprisingly, has the structure of .git/machete file changed somehow? I.e. a different branch was a root of the tree before the traversal, and a different ones afterwards? 😯

[andrii0lomakin]

:-)

I have a branch develop, which is checked out in a folder/worktree with the same name, and I have a worktree for the chain of features, develop ->A->B when I run traverse on forked branch B, which is checked out in it's worktree (let suppose folder si is dedecated for the chain A->B), the branch in the develop folder changes (checked out) to A and then not checked out back to develop.

P.S. We are an open source project, so I will try to provide a reproducer to you.

[PawelLipski]

Okay so if you could confirm the below breakdown to make sure I understand it correctly:

Branch	Worktree before traverse	Worktree after traverse - actual	Worktree after traverse - expected
develop	develop/	(nowhere)	develop/
A	(nowhere)	develop/	(nowhere)
B	si/	si/ (?)	si/

For clarity, is develop/ the main worktree? And the CWD when running traverse is also develop/?

Also, you can check if the newly added machete.traverse.whenBranchNotCheckedOutInAnyWorktree config key (Ctrl+F in config docs) is useful in your case - but it looks to me it's a different problem.
I think neither or the existing options (cd-into-main-worktree, stay-in-the-current-worktree) will work in your case - i.e. neither will force traverse to check out A in si/ folder, instead in both cases it'll be checked out in develop/ (which is IIUC both the main worktree, and the worktree where traverse reached right before visiting A).

A full repro on an actual would be very useful! and the logs from git machete traverse invocation.

[PawelLipski]

Note that IIUC for your specific case, it might be just enough to run cd develop/ && git checkout develop after each traverse (possibly squeezed into a shell alias). I'm a bit reluctant to introduce new config keys/flags unless really necessary, there's a lot of moving parts in git-machete already ⚙️