Skip to content

Commit

Permalink
fix: ensure we're logging series error
Browse files Browse the repository at this point in the history
  • Loading branch information
ndom91 committed Nov 20, 2024
1 parent c13aba6 commit 4f4894d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions crates/gitbutler-branch-actions/src/stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,10 @@ pub(crate) fn stack_series(
&stack_dependencies,
)
.map_or_else(
|err| (Err(err), false),
|err| {
tracing::error!("Series Error: {}", err);
(Err(err), false)
},
|(patch_series, force)| (Ok(patch_series), force),
);
if force {
Expand All @@ -278,7 +281,6 @@ fn stack_branch_to_api_branch(
let mut requires_force = false;
let repository = ctx.repository();
let branch_commits = stack_branch.commits(ctx, stack)?;
// anyhow::bail!("Lets pretend this is a real error");
let remote = default_target.push_remote_name();
let upstream_reference = if stack_branch.pushed(remote.as_str(), repository) {
Some(stack_branch.remote_reference(remote.as_str()))
Expand Down

0 comments on commit 4f4894d

Please sign in to comment.