Skip to content

fix hook panicking #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2020
Merged

fix hook panicking #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions asyncgit/src/sync/hooks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub fn hooks_commit_msg(
work_dir.as_str(),
HOOK_COMMIT_MSG,
&[HOOK_COMMIT_MSG_TEMP_FILE],
);
)?;

// load possibly altered msg
msg.clear();
Expand All @@ -54,9 +54,7 @@ pub fn hooks_pre_commit(repo_path: &str) -> Result<HookResult> {
let work_dir = work_dir_as_string(repo_path)?;

if hook_runable(work_dir.as_str(), HOOK_PRE_COMMIT) {
let res = run_hook(work_dir.as_str(), HOOK_PRE_COMMIT, &[]);

Ok(res)
Ok(run_hook(work_dir.as_str(), HOOK_PRE_COMMIT, &[])?)
} else {
Ok(HookResult::Ok)
}
Expand All @@ -69,7 +67,7 @@ pub fn hooks_post_commit(repo_path: &str) -> Result<HookResult> {
let work_dir_str = work_dir.as_str();

if hook_runable(work_dir_str, HOOK_POST_COMMIT) {
Ok(run_hook(work_dir_str, HOOK_POST_COMMIT, &[]))
Ok(run_hook(work_dir_str, HOOK_POST_COMMIT, &[])?)
} else {
Ok(HookResult::Ok)
}
Expand Down Expand Up @@ -109,7 +107,7 @@ fn run_hook(
path: &str,
hook_script: &str,
args: &[&str],
) -> HookResult {
) -> Result<HookResult> {
let arg_str = format!("{} {}", hook_script, args.join(" "));
let bash_args = vec!["-c".to_string(), arg_str];

Expand All @@ -123,18 +121,16 @@ fn run_hook(
"DUMMY_ENV_TO_FIX_WINDOWS_CMD_RUNS",
"FixPathHandlingOnWindows",
)
.output();

let output = output.expect("general hook error");
.output()?;

if output.status.success() {
HookResult::Ok
Ok(HookResult::Ok)
} else {
let err = String::from_utf8_lossy(&output.stderr);
let out = String::from_utf8_lossy(&output.stdout);
let formatted = format!("{}{}", out, err);

HookResult::NotOk(formatted)
Ok(HookResult::NotOk(formatted))
}
}

Expand Down