scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-08-28 05:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Skip push when local branch is already in sync with origin

Browse source 
Before worktree creation, compare local and remote ref SHAs to avoid
unnecessary pushes. When already in sync, log at INFO and print nothing.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-03-09 15:59:59 -04:00
parent bcbd69246b
commit 7cddb14fb1
2 changed files with 169 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/crates/arc-workflows/src/cli/run.rs
View file

@ -531,27 +531,39 @@ pub async fn run_command(
if should_create_worktree {
if let Some(ref branch) = detected_base_branch {
let repo_path = original_cwd.clone();
let branch_owned = branch.clone();
let result = crate::git::blocking_push_with_timeout(60, move || {
crate::git::push_branch(&repo_path, "origin", &branch_owned)
let check_repo = original_cwd.clone();
let check_branch = branch.clone();
let needs_push = tokio::task::spawn_blocking(move || {
crate::git::branch_needs_push(&check_repo, "origin", &check_branch)
})
.await;
match result {
Ok(()) => {
tracing::info!(%branch, "Pushed current branch to origin");
eprintln!(
"{} {branch} (synced local commits to remote)",
styles.bold.apply_to("Pushed branch:")
);
}
Err(e) => {
tracing::warn!(error = %e, %branch, "Failed to push current branch");
eprintln!(
"{} Failed to push {branch} to origin: {e}",
styles.yellow.apply_to("Warning:")
);
.await
.unwrap_or(true);
if needs_push {
let repo_path = original_cwd.clone();
let branch_owned = branch.clone();
let result = crate::git::blocking_push_with_timeout(60, move || {
crate::git::push_branch(&repo_path, "origin", &branch_owned)
})
.await;
match result {
Ok(()) => {
tracing::info!(%branch, "Pushed current branch to origin");
eprintln!(
"{} {branch} (synced local commits to remote)",
styles.bold.apply_to("Pushed branch:")
);
}
Err(e) => {
tracing::warn!(error = %e, %branch, "Failed to push current branch");
eprintln!(
"{} Failed to push {branch} to origin: {e}",
styles.yellow.apply_to("Warning:")
);
}
}
} else {
tracing::info!(%branch, "Branch already in sync with origin, skipping push");
}
}
}

138
lib/crates/arc-workflows/src/git.rs
View file

@ -358,6 +358,22 @@ where
}
}
/// Returns true if the local branch has commits not yet on the remote.
/// On any git error (no remote ref, detached HEAD, etc.), returns true
/// so the caller falls back to pushing.
pub fn branch_needs_push(repo: &Path, remote: &str, branch: &str) -> bool {
let local = git_cmd(repo)
.args(["rev-parse", &format!("refs/heads/{branch}")])
.output();
let remote_ref = git_cmd(repo)
.args(["rev-parse", &format!("refs/remotes/{remote}/{branch}")])
.output();
match (local, remote_ref) {
(Ok(l), Ok(r)) if l.status.success() && r.status.success() => l.stdout != r.stdout,
_ => true,
}
}
/// Sanitize a string for use as a git ref component.
/// Lowercases, replaces non-alphanumeric chars with dashes, collapses runs.
pub fn sanitize_ref_component(s: &str) -> String {
@ -1318,4 +1334,126 @@ mod tests {
let result = push_branch(dir.path(), "nonexistent", "main");
assert!(result.is_err());
}
#[test]
fn branch_needs_push_when_ahead() {
let dir = tempfile::tempdir().unwrap();
let repo_dir = dir.path().join("repo");
let remote_dir = dir.path().join("remote.git");
Command::new("git")
.args(["init", "--bare"])
.arg(&remote_dir)
.output()
.unwrap();
Command::new("git")
.args(["init"])
.arg(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args(["remote", "add", "origin"])
.arg(&remote_dir)
.current_dir(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args([
"-c",
"user.name=test",
"-c",
"user.email=test@test",
"commit",
"--allow-empty",
"-m",
"init",
])
.current_dir(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args(["branch", "-M", "main"])
.current_dir(&repo_dir)
.output()
.unwrap();
// Push once to establish remote tracking
push_branch(&repo_dir, "origin", "main").unwrap();
// Make another commit locally (now ahead of remote)
Command::new("git")
.args([
"-c",
"user.name=test",
"-c",
"user.email=test@test",
"commit",
"--allow-empty",
"-m",
"second",
])
.current_dir(&repo_dir)
.output()
.unwrap();
assert!(branch_needs_push(&repo_dir, "origin", "main"));
}
#[test]
fn branch_needs_push_when_in_sync() {
let dir = tempfile::tempdir().unwrap();
let repo_dir = dir.path().join("repo");
let remote_dir = dir.path().join("remote.git");
Command::new("git")
.args(["init", "--bare"])
.arg(&remote_dir)
.output()
.unwrap();
Command::new("git")
.args(["init"])
.arg(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args(["remote", "add", "origin"])
.arg(&remote_dir)
.current_dir(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args([
"-c",
"user.name=test",
"-c",
"user.email=test@test",
"commit",
"--allow-empty",
"-m",
"init",
])
.current_dir(&repo_dir)
.output()
.unwrap();
Command::new("git")
.args(["branch", "-M", "main"])
.current_dir(&repo_dir)
.output()
.unwrap();
push_branch(&repo_dir, "origin", "main").unwrap();
assert!(!branch_needs_push(&repo_dir, "origin", "main"));
}
#[test]
fn branch_needs_push_when_no_remote_ref() {
let dir = tempfile::tempdir().unwrap();
let repo_dir = dir.path();
init_repo(repo_dir);
// No remote at all — should return true (safe default)
assert!(branch_needs_push(repo_dir, "origin", "main"));
}
}