Skip to content

v1.6.0

Choose a tag to compare

@thomasbachem thomasbachem released this 04 Oct 07:53
· 175 commits to main since this release

Parallel sessions can no longer overwrite each other's pauses, and --amend-into folds into a commit that had the file under an older name.

A repository holds one pause at a time, and every mutating mode refuses while one is open. That check runs as a run starts, though, so a run reaching a conflict, a failed check, a split or an edit pause after a parallel session's had been recorded wrote over it: the first session's worktree was left behind, and its --continue picked up the other run's pause or found none. Such a run now refuses as in flight, as it would have at the start, removes the temporary worktree it made and leaves the other pause as it was. A worktree named with -C stays.

A run that failed while a parallel session's pause was recorded also kept its own temporary worktree, taking that pause for its own, so worktrees piled up where sessions overlapped. A failed run now keeps one only for a pause of its own. Leftovers from earlier versions can go with git worktree remove – any git-edit-* worktree that git edit --status doesn't name.

--amend-into refuses a staged path its target doesn't have where a later commit introduces it, since folding beneath that introduction makes every later commit touching the file conflict. A path that was only renamed since was refused the same way, though the fold's replay carries the change to the old name. Such a path now folds onto its old name wherever git's rename detection pairs the two as that replay will, and a note names the old path. A staged deletion of such a path, or a rename git can't pair, is still refused.

brew install thomasbachem/tap/git-edit

Or brew upgrade git-edit where it is already installed, or pull the repo if its folder is on your PATH.