✕ Run #74 failed

0.0sfetching andymccall/oxygen for state 0912a0337a95+0955469ac0e1+11c958021e1a+21b2aec279ff+4161262eeb29+5e4e2ef26abb+60a1223c894f+7df9007b163c+8349c327fe83+89a1d0243544+958fb27dda7c+99e3e0af08df+adec9a0796b8+b288cd254343+b4fa2bc1ca6a+bdd894b548e4+be451356e3ef+dfe165877345+fd3f920f0b24+fe7a964b3c88
0.3sbooting a microVM: 1 vCPU, 1024 MiB, rootfs 9d76e1aef3ab
0.7sDiff in /src/crates/oxy-core/src/repo/tests.rs:1556:
0.7s     write(&g, "run.sh", b"#!/bin/sh\necho discarded\n");
0.7s     git(&["commit", "-q", "-am", "discarded edit"]);
0.7s     git(&["checkout", "-q", "main"]);
0.7s-    git(&["merge", "-q", "-s", "ours", "-m", "merge discarded, keeping ours", "discarded"]);
0.7s+    git(&[
0.7s+        "merge",
0.7s+        "-q",
0.7s+        "-s",
0.7s+        "ours",
0.7s+        "-m",
0.7s+        "merge discarded, keeping ours",
0.7s+        "discarded",
0.7s+    ]);
0.7s     let expected_count: usize = git(&["rev-list", "--count", "main"]).parse().unwrap();
0.7s 
0.7s     let dest = root.join("oxy");
0.7sDiff in /src/crates/oxy-core/src/repo/tests.rs:1564:
0.7s     let rep = repo.import_git(&g, "main").unwrap();
0.7s     assert_eq!(rep.commits, expected_count);
0.7s     assert_eq!(rep.merges, 3);
0.7s-    assert_eq!(fs::read(dest.join("run.sh")).unwrap(), b"#!/bin/sh\n", "the ours merge kept main's run.sh");
0.7s+    assert_eq!(
0.7s+        fs::read(dest.join("run.sh")).unwrap(),
0.7s+        b"#!/bin/sh\n",
0.7s+        "the ours merge kept main's run.sh"
0.7s+    );
0.7s     let v = repo.verify_git_import(&g, "main").unwrap();
0.7s     assert_eq!(v.commits, expected_count, "every commit's tree reproduced");
0.7s     assert!(v.mismatches.is_empty(), "{:?}", v.mismatches);