git-workflow 0.4.1

Git guardrails for AI coding agents - safe git workflows with clear state feedback
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

//! Shared helpers for commands

use crate::error::Result;
use crate::git;
use crate::output;

/// Pull from origin (fast-forward only) and display results
///
/// This function:
/// 1. Displays "Syncing with {remote}..." message
/// 2. Pulls from origin using fast-forward only
/// 3. Shows how many commits were pulled (or "Already up to date")
///
/// Returns Ok(true) if new commits were pulled, Ok(false) if already up to date.
/// Returns an error if the local branch has diverged from the remote.
pub fn pull_with_output(default_remote: &str, default_branch: &str, verbose: bool) -> Result<bool> {
    output::info(&format!("Syncing with {}...", default_remote));

    let before = git::head_commit()?;

    if let Err(e) = git::pull_ff_only("origin", default_branch, verbose) {
        output::error("Cannot fast-forward. Local branch has diverged from remote.");
        output::hints(&[
            &format!("git rebase {}  # Rebase local changes", default_remote),
            "git pull       # Merge (creates merge commit)",
        ]);
        return Err(e);
    }

    let after = git::head_commit()?;

    if before != after {
        let count = git::commit_count(&before, &after)?;
        output::success(&format!(
            "Pulled {} commit(s) from {}",
            output::bold(&count.to_string()),
            default_remote
        ));
        Ok(true)
    } else {
        output::success(&format!("Already up to date with {}", default_remote));
        Ok(false)
    }
}