1523994 - Can't submit commit that is checked out in multiple worktrees, results in bad local state

Status: NEW

(Conduit :: moz-phab, enhancement, P3)

Description

[Kartikaya Gupta (email:[e-mail])]

git checkout -b foo master
// make a couple of commits
git worktree add -b bar ../wtree foo
moz-phab submit --upstream master

Prior to running moz-phab there are two branches, foo and bar, pointing to the same commit, checked out in differernt worktrees. Running moz-phab fails, but after creating differential revisions. And it leaves you in some detached HEAD state. So then you have to clean up manually, abandon the created revisions, and do it over.

Comment 1

[Kartikaya Gupta (email:[e-mail])]

FWIW this works better now. It submits the patches and brings you back on the branch you started at. It then (I think) tries to check out the other branch, maybe to rebase it? But that fails since the other branch is already checked out in a different worktree, so it prints out an error and stops. Despite the error it leaves you in a pretty good end state.