Skip to content

fix: patchable worktree initialization #977

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
merged 1 commit into from
Jan 17, 2025
Merged

fix: patchable worktree initialization #977

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
4 changes: 2 additions & 2 deletions patchable.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ def "main checkout" [
# $GIT_DIR must be the worktree's .git dir, even if that is just an alias for the backing repo, since each worktree maintains its own index
$env.GIT_DIR = $"($worktree_path)/.git"
$env.GIT_WORK_TREE = $worktree_path
let worktree_git_dir = git rev-parse --git-dir
let worktree_rebase_progress_dir = $"($worktree_git_dir)/rebase-apply"
if ($worktree_path | path exists) {
let worktree_git_dir = git rev-parse --git-dir
let worktree_rebase_progress_dir = $"($worktree_git_dir)/rebase-apply"
log info "Worktree root already exists, resetting"
if ($worktree_rebase_progress_dir | path exists) {
if $force {
Expand Down
Loading