Skip to content

Commit 9e9876c

Browse files
author
MergeBuilder
committed
test(merge): decode parent assertion output
1 parent 570a1f3 commit 9e9876c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

  • crates/preloop-runner-server/src

‎crates/preloop-runner-server/src/runs.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4534,10 +4534,11 @@ mod tests {
45344534
);
45354535
let snapshot_repository = state_dir.join(&snapshot.repository);
45364536
assert_eq!(
4537-
git_in(
4537+
String::from_utf8(git_in(
45384538
&snapshot_repository,
4539-
&["log", "--format=%P", "-1", &merge.sha]
4540-
),
4539+
&["log", "--format=%P", "-1", &merge.sha],
4540+
))
4541+
.unwrap(),
45414542
format!("{} {}\n", merge.base_sha, merge.head_sha),
45424543
"the checked-out merge must have fetched base first and dirty head second"
45434544
);

0 commit comments

Comments
 (0)