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
167 changes: 167 additions & 0 deletions git-branchless/tests/test_move.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6329,6 +6329,173 @@ fn test_move_fixup_added_files() -> eyre::Result<()> {
Ok(())
}

#[test]
fn test_move_reparent() -> eyre::Result<()> {
let git = make_git()?;
git.init_repo()?;

git.detach_head()?;
let _test1_oid = git.commit_file("test1", 1)?;
let test2_oid = git.commit_file("test2_will_also_contain_test1_when_reparented", 2)?;
let test3_oid = git.commit_file("test3_will_also_contain_test2_when_reparented", 3)?;
{
let stdout = git.smartlog()?;
insta::assert_snapshot!(stdout, @r"
O f777ecc (master) create initial.txt
|
o 62fc20d create test1.txt
|
o 06309ac create test2_will_also_contain_test1_when_reparented.txt
|
@ f41e0bb create test3_will_also_contain_test2_when_reparented.txt
");
}

{
let (stdout, _stderr) = git.branchless(
"move",
&[
"--source",
&test2_oid.to_string(),
"--dest",
"master",
"--reparent",
],
)?;
insta::assert_snapshot!(stdout, @r"
Attempting rebase in-memory...
[1/2] Committed as: 40ca381 create test2_will_also_contain_test1_when_reparented.txt
[2/2] Committed as: e4eeed5 create test3_will_also_contain_test2_when_reparented.txt
branchless: processing 2 rewritten commits
branchless: running command: <git-executable> checkout e4eeed5c5bdc5a63228f1ac956cd58df0af1b670
O f777ecc (master) create initial.txt
|\
| o 62fc20d create test1.txt
|
o 40ca381 create test2_will_also_contain_test1_when_reparented.txt
|
@ e4eeed5 create test3_will_also_contain_test2_when_reparented.txt
In-memory rebase succeeded.
");
}

git.branchless("prev", &[])?;
{
let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "HEAD"])?;
insta::assert_snapshot!(stdout, @r"
test1.txt | 1 +
test2_will_also_contain_test1_when_reparented.txt | 1 +
2 files changed, 2 insertions(+)
");
}

// test --reparent with --insert
{
let (stdout, _stderr) = git.branchless(
"move",
&[
"--source",
&test3_oid.to_string(),
"--dest",
"master",
"--reparent",
"--insert",
],
)?;
insta::assert_snapshot!(stdout, @r"
Attempting rebase in-memory...
[1/4] Committed as: 3f0558d create test3_will_also_contain_test2_when_reparented.txt
[2/4] Committed as: e1e0b99 create test2_will_also_contain_test1_when_reparented.txt
[3/4] Committed as: 4b5cd3e create test3_will_also_contain_test2_when_reparented.txt
[4/4] Committed as: fee6ba0 create test1.txt
branchless: processing 4 rewritten commits
branchless: running command: <git-executable> checkout e1e0b9952583334793f781ef25a6ce8d861cf85f
O f777ecc (master) create initial.txt
|
o 3f0558d create test3_will_also_contain_test2_when_reparented.txt
|\
| o fee6ba0 create test1.txt
|
@ e1e0b99 create test2_will_also_contain_test1_when_reparented.txt
|
o 4b5cd3e create test3_will_also_contain_test2_when_reparented.txt
In-memory rebase succeeded.
");
}
Comment on lines +6392 to +6424
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.

[please change] This seems like a bug. If we move test3, I would expect it to be moved completely, not copied. I suspect that there is a conflict/oversight happening in the rebase planner that isn't indicating that the original test3 has been replaced w/ the new one.


// the reparented test3 contains everything, including test1 and test2
git.branchless("prev", &[])?;
{
let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "HEAD"])?;
insta::assert_snapshot!(stdout, @r"
test1.txt | 1 +
test2_will_also_contain_test1_when_reparented.txt | 1 +
test3_will_also_contain_test2_when_reparented.txt | 1 +
3 files changed, 3 insertions(+)
");
}

// the descendant test2 should come without test3 like before
{
let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "e1e0b99"])?;
insta::assert_snapshot!(stdout, @r"
test3_will_also_contain_test2_when_reparented.txt | 1 -
1 file changed, 1 deletion(-)
");
}

// similarly the descendant test1 should come without test1 and test2
{
let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "fee6ba0"])?;
insta::assert_snapshot!(stdout, @r"
test2_will_also_contain_test1_when_reparented.txt | 1 -
test3_will_also_contain_test2_when_reparented.txt | 1 -
2 files changed, 2 deletions(-)
");
}

// the final descendant test3 should be identical with the inserted test3
git.branchless("switch", &["4b5cd3e"])?;
{
let (stdout, _stderr) = git.run(&["diff", "3f0558d"])?;
insta::assert_snapshot!(stdout, @"");
}

// test --reparent with --exact
{
let (stdout, _stderr) = git.branchless(
"move",
&["--exact", "e1e0b99", "--dest", "master", "--reparent"],
)?;
insta::assert_snapshot!(stdout, @r"
Attempting rebase in-memory...
[1/2] Skipped now-empty commit: 5cdb6f1 create test3_will_also_contain_test2_when_reparented.txt
[2/2] Committed as: 40ca381 create test2_will_also_contain_test1_when_reparented.txt
branchless: processing 2 rewritten commits
branchless: running command: <git-executable> checkout 3f0558d435e63ebdfd1e81f5dbd3ddfaca387864
O f777ecc (master) create initial.txt
|\
| o 40ca381 create test2_will_also_contain_test1_when_reparented.txt
|
@ 3f0558d create test3_will_also_contain_test2_when_reparented.txt
|
o fee6ba0 create test1.txt
In-memory rebase succeeded.
");
}
Comment on lines +6464 to +6485
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.

[comment (no action needed)] When the "copied test3" bug is fixed, this test may go away, it seems.

[suggestion (non-blocking)] I think it would be easier to follow these tests if we used branch names for each of the commits. Then we could refer to (eg) test-2 instead of e1e0b99.


{
let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "40ca381"])?;
insta::assert_snapshot!(stdout, @r"
test1.txt | 1 +
test2_will_also_contain_test1_when_reparented.txt | 1 +
2 files changed, 2 insertions(+)
");
}

Ok(())
}

#[test]
fn test_worktree_rebase_in_memory() -> eyre::Result<()> {
let git = make_git()?;
Expand Down