Skip to content

Commit

Permalink
feat(restack): don't show the smartlog after each rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
arxanas committed Feb 27, 2022
1 parent 56fe48f commit 496ad07
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/commands/restack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ use crate::core::rewrite::{
BuildRebasePlanOptions, ExecuteRebasePlanOptions, ExecuteRebasePlanResult, RebasePlanBuilder,
RepoPool, RepoResource,
};
use crate::git::{GitRunInfo, NonZeroOid, Repo};
use crate::git::{CheckOutCommitOptions, GitRunInfo, NonZeroOid, Repo};
use crate::opts::MoveOptions;

#[instrument(skip(commits))]
Expand Down Expand Up @@ -282,7 +282,10 @@ pub fn restack(
force_in_memory,
force_on_disk,
resolve_merge_conflicts,
check_out_commit_options: Default::default(),
check_out_commit_options: CheckOutCommitOptions {
additional_args: &[],
render_smartlog: false,
},
};
let pool = ThreadPoolBuilder::new().build()?;
let repo_pool = RepoResource::new_pool(&repo)?;
Expand Down
2 changes: 0 additions & 2 deletions tests/command/test_restack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,6 @@ fn test_restack_checked_out_branch() -> eyre::Result<()> {
branchless: processing 2 updates: branch foo, branch master
branchless: processing 1 rewritten commit
branchless: running command: <git-executable> checkout foo
:
@ 59e75818 (foo, master) create test2.txt
In-memory rebase succeeded.
Finished restacking commits.
No abandoned branches to restack.
Expand Down

0 comments on commit 496ad07

Please sign in to comment.