hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 14:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor git index refresh logic in syncback

Browse source 
- Simplified the `refresh_git_index` function by removing the retry mechanism and directly handling the exit code of the `git update-index --refresh` command. Now, it logs a warning only if the command fails to execute, improving clarity and reducing unnecessary complexity.
This commit is contained in:
Joe 2026-02-02 14:24:54 -06:00
parent d4ae0820bc
commit dddab62ea1
1 changed files with 9 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/cli/syncback.rs
View file

@ -361,45 +361,15 @@ fn refresh_git_index(project_dir: &Path) {
if is_git_repo {
log::info!("Refreshing git index...");
let mut attempts = 0;
loop {
attempts += 1;
let result = Command::new("git")
.args(["update-index", "--refresh"])
.current_dir(project_dir)
.stdout(Stdio::null())
.stderr(Stdio::null())
.status();
match result {
Ok(status) => {
if status.success() {
log::info!("Git index refreshed.");
break;
} else if attempts < 2 {
log::debug!(
"git update-index --refresh exited with: {}, retrying in 500ms...",
status
);
std::thread::sleep(std::time::Duration::from_millis(500));
} else {
log::warn!("git update-index --refresh exited with: {}", status);
break;
}
}
Err(e) => {
if attempts < 2 {
log::debug!(
"Failed to run git update-index --refresh: {}, retrying in 500ms...",
e
);
std::thread::sleep(std::time::Duration::from_millis(500));
} else {
log::warn!("Failed to run git update-index --refresh: {}", e);
break;
}
}
}
// Exit code 1 is normal - it just means files were refreshed.
// We only warn if git itself fails to run.
match Command::new("git")
.args(["update-index", "--refresh", "-q"])
.current_dir(project_dir)
.status()
{
Ok(_) => log::info!("Git index refreshed."),
Err(e) => log::warn!("Failed to run git update-index --refresh: {}", e),
}
} else {
log::debug!("Not a git repository, skipping index refresh.");