Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion git-branchless-smartlog/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,13 @@ pub fn smartlog(
reverse,
} = options;

let repo = Repo::from_dir(&git_run_info.working_directory)?;
let repo = match Repo::from_dir(&git_run_info.working_directory) {
Ok(repo) => repo,
Err(err) => {
writeln!(effects.get_error_stream(), "{err}",)?;
return Ok(Err(ExitCode(1)));
}
};
let head_info = repo.get_head_info()?;
let conn = repo.get_db_conn()?;
let event_log_db = EventLogDb::new(&conn)?;
Expand Down
20 changes: 20 additions & 0 deletions git-branchless-smartlog/tests/test_smartlog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,26 @@ fn test_smartlog_sparse_main_false_head() -> eyre::Result<()> {
Ok(())
}

#[cfg(unix)]
#[test]
fn test_error_without_panic_on_missing_repo() -> eyre::Result<()> {
let git = make_git()?;

{
let (_stdout, stderr) = git.branchless_with_options(
"smartlog",
&[],
&GitRunOptions {
expected_exit_code: 1,
..Default::default()
},
)?;
insta::assert_snapshot!(stderr, @"could not open repository: could not find repository from '<repo-path>'; class=Repository (6); code=NotFound (-3)");
}

Ok(())
}

#[test]
fn test_smartlog_hidden() -> eyre::Result<()> {
let git = make_git()?;
Expand Down