Skip to content

applying a branch puts project into a bad state after updating to 0.13.10 #5459

@nathanwhit

Description

@nathanwhit

Version

0.13.10

Operating System

macOS

Distribution Method

dmg (Apple Silicon)

Describe the issue

Upon updating to 0.13.10, I found that my existing workspace was unusable, with GitButler hitting errors and the project history being unable to load. I removed the project, and re-added it, but now if I apply a branch to the workspace I immediately begin hitting errors again – with the same "unrecoverable" state (the only way to get back to a working state is to remove the project and re-add it).

The first error that appears is consistently regarding one of our submodules, for instance:

The object c5d7930d5700dbbbedea607f9cf3e50acdc33e2d (160000) at 'std' could not be found

or

The object d12a68fc4930062c0bed26447a6b5245697e77c1 (160000) at 'suite' could not be found

Note that stdand suite are git submodules of the repo, and the ref there is the commit of the submodule:

❯ git submodule status
 af4c6a1eee825f19d3b3cce74cfdd03ebe1a3b92 cli/bench/testdata/lsp_benchdata (af4c6a1e)
 d12a68fc4930062c0bed26447a6b5245697e77c1 tests/node_compat/runner/suite (v18.12.1-3-gd12a68f)
 c5d7930d5700dbbbedea607f9cf3e50acdc33e2d tests/util/std (release-2024.09.12)
 e78446e34a1921371658a5df08c71d83f50a2a2f tests/wpt/suite (epochs/daily/2024-08-28_01H)

Here's a video illustrating the issue, starting from adding the project fresh:

output.mp4

I'm happy to provide any other info you need to help debug this

How to reproduce

  1. Clone https://github.com/nathanwhit/deno : git clone https://github.com/nathanwhit/deno
  2. Init submodules: git submodule update --init --recursive
  3. Open repo in GitButler
  4. Apply the node-gyp-server-repro-backup branch

Note that it seems like the first time you apply it, it errors, but at least the project history will load and let you revert applying the branch. The next time you apply the branch, the project history will be broken as well

Expected behavior

No response

Relevant log output

No response

Metadata

Metadata

Assignees

Labels

bugSomething isn't working🎉reproduced🎉The issue could be reproduced by following the instructions🦀gitoxide🦀`gitoxide` might help here

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions