Fix but amend with multiple sources by refreshing rewritten commit target

[Copilot]

but amend <source1,source2,...> <commit> was applying the first source, rewriting the commit, then trying to amend the remaining sources into the stale pre-rewrite commit ID. This caused multi-file amend to fail mid-operation.

• Regression coverage

  • Added amend_command_with_multiple_files in crates/but/tests/but/command/rub.rs.
  • Test stages two files, amends both into one commit via comma-separated source IDs, and asserts both changes are present in the resulting commit with no leftover assigned/unassigned changes.

• Amend execution now returns rewritten commit ID

  • Updated crates/but/src/command/legacy/rub/amend.rs:
    • uncommitted_to_commit(...) -> anyhow::Result<Option<ObjectId>>
    • assignments_to_commit(...) -> anyhow::Result<Option<ObjectId>>
  • Both functions now return outcome.new_commit so callers can continue with the latest commit identity.

• Rub operation pipeline propagates commit rewrites

  • Updated RubOperation::execute(...) in crates/but/src/command/legacy/rub/mod.rs to return Option<ObjectId>.
  • Amend paths return the new commit OID; non-amend paths return None.
  • handle(...) now updates the in-loop CliId::Commit target when an operation rewrites the commit, so subsequent sources amend into the current commit.

if let Some(new_commit) = operation.execute(ctx, out)? {
    if let CliId::Commit { id, .. } = target {
        target = CliId::Commit { commit_id: new_commit, id };
    }
}

---

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
gitbutler-web	Ignored	Preview	Feb 23, 2026 11:35am