giers10/auto-git-gui
1
0
Fork 0
Code Releases Activity

Improve reword_commits_sequentially robustness by verifying commit hash before interactive rebase

Browse Source
This commit is contained in:
Victor Giers
2026-07-12 11:26:20 +02:00
parent 6bf77cebab
commit ce73d0273a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/main.rs
View File

@@ -1044,12 +1044,17 @@ fn reword_commits_sequentially(
"GIT_EDITOR".to_string(), "GIT_EDITOR".to_string(),
message_path.to_string_lossy().to_string(), message_path.to_string_lossy().to_string(),
); );
run_git_owned( let rebase_args = if run_git(
repo_path, repo_path,
&["rebase".into(), "-i".into(), format!("{full_hash}^")], &["rev-parse", "--verify", &format!("{full_hash}^")],
Some(&env), )
None, .is_ok()
)?; {
vec!["rebase".into(), "-i".into(), format!("{full_hash}^")]
} else {
vec!["rebase".into(), "-i".into(), "--root".into()]
};
run_git_owned(repo_path, &rebase_args, Some(&env), None)?;
} }
if stashed { if stashed {