gitgrip 0.18.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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168

//! Integration tests for the commit command.

mod common;

use common::assertions::assert_repo_clean;
use common::fixtures::WorkspaceBuilder;
use common::git_helpers;

#[test]
fn test_commit_across_repos() {
    let ws = WorkspaceBuilder::new()
        .add_repo("frontend")
        .add_repo("backend")
        .build();

    let manifest = ws.load_manifest();

    // Create branch (good practice, avoid committing on main)
    gitgrip::cli::commands::branch::run_branch(gitgrip::cli::commands::branch::BranchOptions {
        workspace_root: &ws.workspace_root,
        manifest: &manifest,
        name: Some("feat/commit-test"),
        delete: false,
        move_commits: false,
        repos_filter: None,
        group_filter: None,
        json: false,
    })
    .unwrap();

    // Create and stage files
    std::fs::write(ws.repo_path("frontend").join("app.js"), "// app").unwrap();
    std::fs::write(ws.repo_path("backend").join("server.rs"), "// server").unwrap();

    let files = vec![".".to_string()];
    gitgrip::cli::commands::add::run_add(&ws.workspace_root, &manifest, &files, None, None)
        .unwrap();

    // Commit
    let result = gitgrip::cli::commands::commit::run_commit(
        &ws.workspace_root,
        &manifest,
        "feat: add initial files",
        false,
        false,
        None,
        None,
    );
    assert!(result.is_ok(), "commit should succeed: {:?}", result.err());

    // Both repos should be clean
    assert_repo_clean(&ws.repo_path("frontend"));
    assert_repo_clean(&ws.repo_path("backend"));
}

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

    let manifest = ws.load_manifest();

    // Only stage changes in app, not lib
    std::fs::write(ws.repo_path("app").join("new.txt"), "content").unwrap();
    std::process::Command::new("git")
        .args(["add", "new.txt"])
        .current_dir(ws.repo_path("app"))
        .output()
        .unwrap();

    // Commit - should only commit in app, skip lib
    let result = gitgrip::cli::commands::commit::run_commit(
        &ws.workspace_root,
        &manifest,
        "feat: app only",
        false,
        false,
        None,
        None,
    );
    assert!(result.is_ok(), "commit should succeed: {:?}", result.err());

    // app should be clean (committed), lib should still be clean (nothing staged)
    assert_repo_clean(&ws.repo_path("app"));
    assert_repo_clean(&ws.repo_path("lib"));
}

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

    let manifest = ws.load_manifest();

    // Commit with no staged changes - should succeed (prints "no changes")
    let result = gitgrip::cli::commands::commit::run_commit(
        &ws.workspace_root,
        &manifest,
        "empty commit",
        false,
        false,
        None,
        None,
    );
    assert!(
        result.is_ok(),
        "commit with no changes should succeed: {:?}",
        result.err()
    );
}

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

    let manifest = ws.load_manifest();

    // Create and commit a file
    std::fs::write(ws.repo_path("app").join("file.txt"), "v1").unwrap();
    std::process::Command::new("git")
        .args(["add", "file.txt"])
        .current_dir(ws.repo_path("app"))
        .output()
        .unwrap();
    gitgrip::cli::commands::commit::run_commit(
        &ws.workspace_root,
        &manifest,
        "initial",
        false,
        false,
        None,
        None,
    )
    .unwrap();

    // Modify and stage again
    std::fs::write(ws.repo_path("app").join("file.txt"), "v2").unwrap();
    std::process::Command::new("git")
        .args(["add", "file.txt"])
        .current_dir(ws.repo_path("app"))
        .output()
        .unwrap();

    // Amend
    let result = gitgrip::cli::commands::commit::run_commit(
        &ws.workspace_root,
        &manifest,
        "amended",
        true,
        false,
        None,
        None,
    );
    assert!(result.is_ok(), "amend should succeed: {:?}", result.err());

    // Verify only 2 commits (initial from fixture + our amended one)
    let output = std::process::Command::new("git")
        .args(["rev-list", "--count", "HEAD"])
        .current_dir(ws.repo_path("app"))
        .output()
        .unwrap();
    let count: usize = String::from_utf8_lossy(&output.stdout)
        .trim()
        .parse()
        .unwrap();
    assert_eq!(count, 2, "should have 2 commits (initial + amended)");
}