d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-05-28 16:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflict markers and cargo fmt drift in main (commands, openai_compat, trident, config, tools)

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-05-25 11:51:44 +09:00
parent 499125c9a3
commit 3364dc4bee
8 changed files with 225 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rust/crates/tools/src/lib.rs
View File

@@ -1937,7 +1937,10 @@ fn run_git_status(input: GitStatusInput) -> Result<String, String> {
Some(output) => to_pretty_json(json!({
"output": output
})),
None => Err("git status failed. Ensure the current directory is inside a git repository.".to_string()),
None => Err(
"git status failed. Ensure the current directory is inside a git repository."
.to_string(),
),
}
}
@@ -1965,7 +1968,9 @@ fn run_git_diff(input: GitDiffInput) -> Result<String, String> {
Some(output) => to_pretty_json(json!({
"output": output
})),
None => Err("git diff failed. Ensure the current directory is inside a git repository.".to_string()),
None => Err(
"git diff failed. Ensure the current directory is inside a git repository.".to_string(),
),
}
}
@@ -1997,7 +2002,9 @@ fn run_git_log(input: GitLogInput) -> Result<String, String> {
Some(output) => to_pretty_json(json!({
"output": output
})),
None => Err("git log failed. Ensure the current directory is inside a git repository.".to_string()),
None => Err(
"git log failed. Ensure the current directory is inside a git repository.".to_string(),
),
}
}
@@ -2019,7 +2026,10 @@ fn run_git_show(input: GitShowInput) -> Result<String, String> {
Some(output) => to_pretty_json(json!({
"output": output
})),
None => Err(format!("git show {} failed. Ensure the commit exists.", input.commit)),
None => Err(format!(
"git show {} failed. Ensure the commit exists.",
input.commit
)),
}
}