Skip to content

feat(move): implement move --reparent like amend --reparent #1631

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

Open
bryango wants to merge 9 commits into
base: master
Choose a base branch
from
Open

feat(move): implement move --reparent like amend --reparent #1631

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b1e6810
refactor(reparent): extract amend --reparent logic
bryango Nov 28, 2025
0230f10
refactor(move): make --reparent option general
bryango Nov 30, 2025
432fd2e
feat(move): implement move --reparent
bryango Nov 29, 2025
5d06c5c
feat(move): add test for move --reparent
bryango Nov 30, 2025
7b9bc96
refactor(plan): use eyre::bail! instead of assert!
bryango Dec 1, 2025
51dcbed
feat(restack): implement --reparent
bryango Dec 2, 2025
b289875
feat(split): --reparent for --detach / --discard
bryango Dec 2, 2025
d3fa892
feat(sync): add --reparent option
bryango Dec 3, 2025
61ff4c0
feat(fix): clarify --merge option ignored when fixing commits
bryango Dec 3, 2025
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
8 changes: 6 additions & 2 deletions git-branchless-lib/src/core/rewrite/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,9 @@ impl<'a> RebasePlanBuilder<'a> {
source_oid: NonZeroOid,
dest_oids: Vec<NonZeroOid>,
) -> eyre::Result<()> {
assert!(!dest_oids.is_empty());
if dest_oids.is_empty() {
eyre::bail!("Destination OIDs must not be empty for move_subtree");
}
Comment on lines +1026 to +1028
Copy link
Collaborator

@claytonrcarter claytonrcarter Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for making this change even though it was preexisting! 😄

self.initial_constraints.push(Constraint::MoveSubtree {
parent_oids: dest_oids,
child_oid: source_oid,
Expand Down Expand Up @@ -1087,7 +1089,9 @@ impl<'a> RebasePlanBuilder<'a> {
parent_oids: Vec<NonZeroOid>,
repo: &Repo,
) -> eyre::Result<()> {
assert!(!parent_oids.is_empty());
if parent_oids.is_empty() {
eyre::bail!("Parent OIDs must not be empty for reparent_subtree");
}

// To keep the contents of all descendant commits the same, forcibly
// replace the children commits, and then rely on normal patch
Expand Down