From: Christian Weisgerber Subject: Re: Interactions between worktrees To: gameoftrees@openbsd.org Date: Fri, 8 Apr 2022 00:45:14 +0200 Stefan Sperling: > The ref which is missing is only created if we manage to attempt a file > merge during the rebase operation. However, the path-prefix check currently > runs between the rebase_prepare() step and the merge_files() step. > So if the path-prefix check errors out we end up not creating a 'commit-' > reference, which is a problem I overlooked. Oh, so rebasing the same branch in another work tree has nothing to do with it. > Deleting all other rebase-related references should recover your work tree: > > got ref -d refs/got/worktree/rebase/branch-e001ae79-bf70-4253-bac2-bdced68c8189 > got ref -d refs/got/worktree/rebase/newbase-e001ae79-bf70-4253-bac2-bdced68c8189 > got ref -d refs/got/worktree/rebase/tmp-e001ae79-bf70-4253-bac2-bdced68c8189 It doesn't. I'm stuck on a magic branch I can't get off: $ got ref -l HEAD: refs/heads/master refs/got/worktree/base-0b362ded-ec96-4543-94aa-441b8aab54d2: 920ea97609113395924d3cee753ab6126bd66e46 refs/got/worktree/base-e001ae79-bf70-4253-bac2-bdced68c8189: aeeb6b7d976582bc8997928f45a911d2cb880ff5 refs/heads/const: 7800f33f966be66c41cb4ac2d4d6122907d6f8fe refs/heads/const_sensors: 920ea97609113395924d3cee753ab6126bd66e46 refs/heads/master: aeeb6b7d976582bc8997928f45a911d2cb880ff5 refs/heads/subord: 37074c805a4fc253a77bc833ba3cfec0cc6ce3d4 refs/remotes/origin/master: aeeb6b7d976582bc8997928f45a911d2cb880ff5 $ got br rebase/tmp-e001ae79-bf70-4253-bac2-bdced68c8189 $ got up -b const got: a rebase operation is in progress in this work tree and must be continued or aborted first $ got rb -a got: reference refs/got/worktree/rebase/branch-e001ae79-bf70-4253-bac2-bdced68c8189 not found -- Christian "naddy" Weisgerber naddy@mips.inka.de