gitgrip 0.19.0

Multi-repo workflow tool - manage multiple git repositories as one
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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81

//! Integration tests for the pull command.

mod common;

use common::fixtures::WorkspaceBuilder;
use common::git_helpers;
use gitgrip::git::open_repo;
use gitgrip::git::remote::{safe_pull_latest_with_mode, PullMode};

#[tokio::test]
async fn test_pull_merge_on_clean_repo() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();
    let manifest = ws.load_manifest();

    let result = gitgrip::cli::commands::pull::run_pull(
        &ws.workspace_root,
        &manifest,
        false,
        None,
        None,
        true,
        true,
    )
    .await;

    assert!(
        result.is_ok(),
        "pull should succeed on clean repo: {:?}",
        result.err()
    );
}

#[test]
fn test_safe_pull_fetches_when_no_upstream() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();
    let repo_path = ws.repo_path("app");

    git_helpers::create_branch(&repo_path, "feature/no-upstream");

    let repo = open_repo(&repo_path).expect("open repo");
    let result = safe_pull_latest_with_mode(&repo, "main", "origin", PullMode::Merge)
        .expect("safe pull should succeed");

    assert!(result.pulled, "expected fetch to count as pulled");
    assert_eq!(result.message.as_deref(), Some("fetched (no upstream)"));
}

#[test]
fn test_safe_pull_reports_missing_remote() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();
    let repo_path = ws.repo_path("app");

    git_helpers::remove_remote(&repo_path, "origin");

    let repo = open_repo(&repo_path).expect("open repo");
    let result = safe_pull_latest_with_mode(&repo, "main", "origin", PullMode::Merge)
        .expect("safe pull should return a result");

    assert!(!result.pulled, "expected pull to fail without a remote");
    assert!(
        result.message.as_ref().is_some_and(|msg| !msg.is_empty()),
        "expected an error message when the remote is missing"
    );
}

#[test]
fn test_safe_pull_nondefault_missing_remote_errors() {
    let ws = WorkspaceBuilder::new().add_repo("app").build();
    let repo_path = ws.repo_path("app");

    git_helpers::create_branch(&repo_path, "feature-no-remote");
    git_helpers::remove_remote(&repo_path, "origin");

    let repo = open_repo(&repo_path).expect("open repo");
    let result = safe_pull_latest_with_mode(&repo, "main", "origin", PullMode::Merge);

    assert!(
        result.is_err(),
        "expected safe pull to error when remote is missing on a feature branch"
    );
}