ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: don't bury GitImportError sources

Browse source 
#3301
This commit is contained in:
Yuya Nishihara 2024-03-16 11:57:33 +09:00
parent a6ee51a998
commit 429cdb38d7
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/command_error.rs
View file

@ -303,7 +303,6 @@ impl From<git2::Error> for CommandError {
impl From<GitImportError> for CommandError { impl From<GitImportError> for CommandError {
fn from(err: GitImportError) -> Self { fn from(err: GitImportError) -> Self {
let message = format!("Failed to import refs from underlying Git repo: {err}");
let hint = match &err { let hint = match &err {
GitImportError::MissingHeadTarget { .. } GitImportError::MissingHeadTarget { .. }
| GitImportError::MissingRefAncestor { .. } => Some( | GitImportError::MissingRefAncestor { .. } => Some(
@ -323,7 +322,10 @@ repository contents."
GitImportError::InternalGitError(_) => None, GitImportError::InternalGitError(_) => None,
GitImportError::UnexpectedBackend => None, GitImportError::UnexpectedBackend => None,
}; };
user_error_with_hint_opt(message, hint) user_error_with_hint_opt(
ErrorWithMessage::new("Failed to import refs from underlying Git repo", err),
hint,
)
} }
} }

6
cli/tests/test_git_fetch.rs
View file

@ -276,7 +276,8 @@ fn test_git_fetch_from_remote_named_git() {
// Try fetching from the remote named 'git'. // Try fetching from the remote named 'git'.
let stderr = &test_env.jj_cmd_failure(&repo_path, &["git", "fetch", "--remote=git"]); let stderr = &test_env.jj_cmd_failure(&repo_path, &["git", "fetch", "--remote=git"]);
insta::assert_snapshot!(stderr, @r###" insta::assert_snapshot!(stderr, @r###"
Error: Failed to import refs from underlying Git repo: Git remote named 'git' is reserved for local Git repository Error: Failed to import refs from underlying Git repo
Caused by: Git remote named 'git' is reserved for local Git repository
Hint: Run `jj git remote rename` to give different name. Hint: Run `jj git remote rename` to give different name.
"###); "###);
@ -288,7 +289,8 @@ fn test_git_fetch_from_remote_named_git() {
// Explicit import is an error. // Explicit import is an error.
// (This could be warning if we add mechanism to report ignored refs.) // (This could be warning if we add mechanism to report ignored refs.)
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["git", "import"]), @r###" insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["git", "import"]), @r###"
Error: Failed to import refs from underlying Git repo: Git remote named 'git' is reserved for local Git repository Error: Failed to import refs from underlying Git repo
Caused by: Git remote named 'git' is reserved for local Git repository
Hint: Run `jj git remote rename` to give different name. Hint: Run `jj git remote rename` to give different name.
"###); "###);