grit-lib 0.5.18

Core library for the grit Git implementation
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

//! Regression: external `git mv` must not leave a stale cache-tree oid on grit diff.

use std::process::Command;

use grit_lib::config::environment::RepositoryOptions;
use grit_lib::diff::{
    build_file_diffs, diff_tree_to_worktree_with_git_dir, DiffDetail, DiffOptions,
};
use grit_lib::repo::{InitOptions, Repository};

fn git(dir: &std::path::Path, args: &[&str]) {
    let out = Command::new("git")
        .current_dir(dir)
        .env("GIT_CONFIG_GLOBAL", "/dev/null")
        .env("GIT_CONFIG_SYSTEM", "/dev/null")
        .env("GIT_CONFIG_NOSYSTEM", "1")
        .env("GIT_AUTHOR_NAME", "T")
        .env("GIT_AUTHOR_EMAIL", "t@e.com")
        .env("GIT_COMMITTER_NAME", "T")
        .env("GIT_COMMITTER_EMAIL", "t@e.com")
        .args(args)
        .output()
        .expect("git");
    assert!(
        out.status.success(),
        "{:?}: {}",
        args,
        String::from_utf8_lossy(&out.stderr)
    );
}

#[test]
fn grit_diff_stat_after_git_mv_does_not_read_stale_cache_tree() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    Repository::init(root, &InitOptions::default()).expect("init");
    std::fs::write(root.join("f.txt"), b"line\n").expect("write");
    git(root, &["add", "."]);
    git(root, &["commit", "-m", "init"]);
    git(root, &["mv", "f.txt", "g.txt"]);
    std::fs::write(root.join("g.txt"), b"line\nextra\n").expect("write");

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let head = grit_lib::state::resolve_head(repo.git_dir()).expect("head");
    let head_tree =
        grit_lib::diff::tree_oid_of_commit(repo.odb(), head.oid().expect("oid")).expect("tree");
    let index = repo.index_handle().load().expect("index");
    let work_tree = repo.work_tree().expect("worktree");
    let config = repo.config().expect("config");
    let policy = repo.thread_policy();

    let raw = diff_tree_to_worktree_with_git_dir(
        repo.odb(),
        Some(&head_tree),
        work_tree,
        repo.git_dir(),
        &index,
        Some(config.as_ref()),
    )
    .expect("tree to worktree");
    build_file_diffs(
        repo.odb(),
        raw,
        DiffDetail::Stat,
        DiffOptions::default(),
        config.as_ref(),
        &policy,
    )
    .expect("stat diff");

    let head_tree2 = head_tree;
    let index2 = repo.index_handle().load().expect("index");
    let staged = grit_lib::diff::diff_index_to_tree(repo.odb(), &index2, Some(&head_tree2), false)
        .expect("index to tree");
    assert!(
        !staged.is_empty(),
        "expected staged changes after git mv, got empty (cache-tree fast path bug?)"
    );
}