diff --git a/cli/build.rs b/cli/build.rs index 942c616981..d949b02c6e 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -47,7 +47,7 @@ fn main() -> std::io::Result<()> { if let Some((mut git_hash, maybe_date)) = get_git_timestamp_and_hash() { git_hash.truncate(16); println!( - "cargo:rustc-env=JJ_VERSION={}-{}-{}", + "cargo:rustc-env=JJ_VERSION={}+{}-{}", version, maybe_date .map(|d| d.format("%Y%m%d").to_string()) diff --git a/cli/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs index 0a28351e51..5756aa3b4b 100644 --- a/cli/tests/test_global_opts.rs +++ b/cli/tests/test_global_opts.rs @@ -72,10 +72,10 @@ fn test_no_subcommand() { assert_matches!( sanitized.as_str(), "jj ?.??.?\n" - | "jj ?.??.?-????????-????????????????\n" + | "jj ?.??.?+????????-????????????????\n" // `dateunknown` turns into `??t?unknown` since d,a,e are hex digits. // TODO(ilyagr): This might be clearer as a regex. - | "jj ?.??.?-??t?unknown-????????????????\n" + | "jj ?.??.?+??t?unknown-????????????????\n" ); let stdout = test_env.jj_cmd_success(test_env.env_root(), &["-R", "repo"]);