diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs index 14eaf8407..fbe7b2692 100644 --- a/cli/src/cli_util.rs +++ b/cli/src/cli_util.rs @@ -2105,6 +2105,7 @@ See https://martinvonz.github.io/jj/latest/working-copy/#stale-working-copy \ .collect(), )?; } + revset_util::warn_unresolvable_trunk(ui, new_repo, &self.env().revset_parse_context())?; Ok(()) } diff --git a/cli/tests/test_git_clone.rs b/cli/tests/test_git_clone.rs index c90221124..e598b031b 100644 --- a/cli/tests/test_git_clone.rs +++ b/cli/tests/test_git_clone.rs @@ -546,7 +546,14 @@ fn test_git_clone_trunk_deleted() { Added 1 files, modified 0 files, removed 0 files "#); - test_env.jj_cmd_ok(&clone_path, &["bookmark", "forget", "main"]); + let (stdout, stderr) = test_env.jj_cmd_ok(&clone_path, &["bookmark", "forget", "main"]); + insta::assert_snapshot!(stdout, @""); + insta::assert_snapshot!(stderr, @r#" + Forgot 1 bookmarks. + Warning: Failed to resolve `revset-aliases.trunk()`: Revision "main@origin" doesn't exist + Hint: Use `jj config edit --repo` to adjust the `trunk()` alias. + "#); + let (stdout, stderr) = test_env.jj_cmd_ok(&clone_path, &["log"]); insta::assert_snapshot!(stdout, @r#" @ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 cad212e1