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

cli: make hint about foo and foo/bar branches more targeted

Browse source 
Many failure to export refs to Git are not about conflicts between a
branch named `foo` and a branch named `foo/bar`, so don't give that
hint in most cases.
This commit is contained in:
Martin von Zweigbergk 2023-09-04 08:36:16 -07:00 committed by Martin von Zweigbergk
parent ef550a9d6d
commit 4ea6b4a75b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cli/src/cli_util.rs
View file

@ -33,7 +33,8 @@ use itertools::Itertools;
use jj_lib::backend::{BackendError, ChangeId, CommitId, MergedTreeId, ObjectId};
use jj_lib::commit::Commit;
use jj_lib::git::{
FailedRefExport, GitConfigParseError, GitExportError, GitImportError, GitRemoteManagementError,
FailedRefExport, FailedRefExportReason, GitConfigParseError, GitExportError, GitImportError,
GitRemoteManagementError,
};
use jj_lib::git_backend::GitBackend;
use jj_lib::gitignore::GitIgnoreFile;
@ -1741,12 +1742,17 @@ pub fn print_failed_git_export(
formatter.write_str("\n")?;
}
drop(formatter);
writeln!(
ui.hint(),
r#"Hint: Git doesn't allow a branch name that looks like a parent directory of
if failed_branches
.iter()
.any(|failed| matches!(failed.reason, FailedRefExportReason::FailedToSet(_)))
{
writeln!(
ui.hint(),
r#"Hint: Git doesn't allow a branch name that looks like a parent directory of
another (e.g. `foo` and `foo/bar`). Try to rename the branches that failed to
export or their "parent" branches."#,
)?;
)?;
}
}
Ok(())
}