git_import_reproduces_trees no longer depends on the machine's git identity, and checks its conflicting merge really started 7df9007b163c
closes #5
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-09-28 17:39 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
7df9007b163c8b03c6f89e9d1b93aab6d66f76d5f18f51b41746a1f845a2a25a- Depends on
- 75167672ebcd 982864068a59 c3069537d7c5
- Depended on by
- nothing yet
- In bookmarks
- agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
- In tags
- v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
- Edits
- 4 atoms, 0 tree operations, 1 file
Browse the tree at this change
modified crates/oxy-core/src/repo/tests.rs +16 −1
| … | 1483 unchanged lines |
||
| 1484 | 1484 | write(&g, "src/lib.rs", b"pub fn a() {}\npub fn c() {}\n"); |
|
| 1485 | 1485 | git(&["commit", "-q", "-am", "clash"]); |
|
| 1486 | 1486 | git(&["checkout", "-q", "main"]); |
|
| 1487 | + | // Expected to stop at the conflict, so its status is ignored; the |
|
| 1488 | + | // identity is passed as for every other git call here, or a machine |
|
| 1489 | + | // without one refuses to start the merge at all. |
|
| 1487 | 1490 | let _ = std::process::Command::new("git") |
|
| 1488 | 1491 | .arg("-C") |
|
| 1489 | 1492 | .arg(&g) |
|
| 1490 | - | .args(["merge", "-q", "clash"]) |
|
| 1493 | + | .args([ |
|
| 1494 | + | "-c", |
|
| 1495 | + | "user.name=Grace", |
|
| 1496 | + | "-c", |
|
| 1497 | + | "[email protected]", |
|
| 1498 | + | "merge", |
|
| 1499 | + | "-q", |
|
| 1500 | + | "clash", |
|
| 1501 | + | ]) |
|
| 1491 | 1502 | .output(); |
|
| 1503 | + | assert!( |
|
| 1504 | + | g.join(".git/MERGE_HEAD").exists(), |
|
| 1505 | + | "the clash merge stopped at its conflict" |
|
| 1506 | + | ); |
|
| 1492 | 1507 | write( |
|
| 1493 | 1508 | &g, |
|
| 1494 | 1509 | "src/lib.rs", |
|
| … | 2376 unchanged lines |