Skip to content

fix: support submodules in worktree #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtth merged 1 commit into from
Aug 7, 2025
+4 −2
Merged

fix: support submodules in worktree #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/git_draft/toolbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def _update_tree(sha: SHA, updates: Sequence[_TreeUpdate], repo: Repo) -> SHA:
case _DeleteBlob(path):
blob_shas[path.parent][path.name] = ""
case _:
raise UnreachableError()
raise UnreachableError(f"Unexpected update: {update}")

def visit_tree(sha: SHA, path: PurePosixPath) -> SHA:
old_lines = null_delimited(repo.git("ls-tree", "-z", sha).stdout)
Expand All @@ -288,8 +288,10 @@ def visit_tree(sha: SHA, path: PurePosixPath) -> SHA:
case "tree":
new_sha = visit_tree(old_sha, path / name)
new_lines.append(f"040000 tree {new_sha}\t{name}")
case "commit": # Submodule
new_lines.append(line)
case _:
raise UnreachableError()
raise UnreachableError(f"Unexpected line: {line}")

for name, blob_sha in new_blob_shas.items():
if blob_sha:
Expand Down