Skip to content

Commit ec849ca

Browse files
authored
Rollup merge of #153060 - ferrocene:jyn/errors, r=jieyouxu
Give a better error when updating a submodule fails Previously this would sometimes just say "unexpected output ``", which was extremely unhelpful. The actual issue was that I had a `.jj` directory but not a `.git` directory, so it couldn't run `git submodule update.`
2 parents 6929f76 + f2f8743 commit ec849ca

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2426,7 +2426,7 @@ pub(crate) fn update_submodule<'a>(
24262426
let actual_hash = recorded
24272427
.split_whitespace()
24282428
.nth(2)
2429-
.unwrap_or_else(|| panic!("unexpected output `{recorded}`"));
2429+
.unwrap_or_else(|| panic!("unexpected output `{recorded}` when updating {relative_path}"));
24302430

24312431
if actual_hash == checked_out_hash {
24322432
// already checked out

0 commit comments

Comments
 (0)