grit-lib 0.5.21

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
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

//! Precompose NFC index paths round-trip with system git (issue #910).

use std::fs;
use std::path::Path;

use grit_test_support::{git_cmd, grit_cmd, unique_tmp};
use tempfile::TempDir;

fn null_config() -> &'static str {
    if cfg!(windows) {
        "NUL"
    } else {
        "/dev/null"
    }
}

fn enable_precomposeunicode(root: &Path) {
    let config_path = root.join(".git/config");
    let mut config = fs::read_to_string(&config_path).expect("read config");
    if !config.contains("precomposeunicode") {
        config.push_str("\n[core]\n\tprecomposeunicode = true\n");
        fs::write(&config_path, config).expect("write precomposeunicode");
    }
}

fn grit_precompose_env(dir: &Path) -> grit_test_support::Cmd {
    grit_cmd(&["init"])
        .in_dir(dir)
        .env("GIT_CONFIG_GLOBAL", null_config())
        .env("GIT_CONFIG_SYSTEM", null_config())
}

#[test]
fn grit_stages_nfc_paths_readable_by_system_git() {
    let dir = TempDir::new().expect("tempdir");
    let root = dir.path();

    grit_precompose_env(root).suc();
    enable_precomposeunicode(root);

    let nfd = format!("cafe\u{0301}.txt");
    fs::write(root.join(&nfd), b"hello\n").expect("write nfd worktree file");

    grit_cmd(&["add"])
        .in_dir(root)
        .env("GIT_CONFIG_GLOBAL", null_config())
        .env("GIT_CONFIG_SYSTEM", null_config())
        .suc();

    grit_cmd(&["commit", "-m", "nfc path"])
        .in_dir(root)
        .env("GIT_CONFIG_GLOBAL", null_config())
        .env("GIT_CONFIG_SYSTEM", null_config())
        .suc();

    let listed = git_cmd(&[
        "-c",
        "core.quotePath=false",
        "ls-tree",
        "-r",
        "HEAD",
        "--name-only",
    ])
    .in_dir(root)
    .suc()
    .stdout
    .trim()
    .to_owned();
    assert_eq!(
        listed.as_bytes(),
        b"caf\xc3\xa9.txt",
        "system git should read NFC UTF-8 path in commit tree"
    );

    let fsck = git_cmd(&["fsck", "--no-dangling"]).in_dir(root).suc();
    assert!(
        fsck.stderr.is_empty() || fsck.ok(),
        "git fsck failed: {}",
        fsck.dump("git fsck")
    );
}

#[test]
fn system_git_staged_nfc_index_readable_by_grit_status() {
    let scratch = unique_tmp("precompose", "git-to-grit");
    fs::create_dir_all(&scratch).expect("scratch");

    git_cmd(&["init"])
        .in_dir(&scratch)
        .env("GIT_CONFIG_GLOBAL", null_config())
        .env("GIT_CONFIG_SYSTEM", null_config())
        .suc();

    git_cmd(&["config", "core.precomposeunicode", "true"])
        .in_dir(&scratch)
        .suc();

    let nfd = format!("cafe\u{0301}.txt");
    fs::write(scratch.join(&nfd), b"from git\n").expect("write");

    git_cmd(&["add", "--", &nfd])
        .in_dir(&scratch)
        .env("GIT_TEST_UTF8_NFD_TO_NFC", "1")
        .suc();

    let out = grit_cmd(&["status", "--json"])
        .in_dir(&scratch)
        .env("GIT_TEST_UTF8_NFD_TO_NFC", "1")
        .env("GIT_CONFIG_GLOBAL", null_config())
        .env("GIT_CONFIG_SYSTEM", null_config())
        .exec();
    assert!(out.ok(), "grit status --json: {}", out.dump("grit status"));
    assert!(
        out.stdout.contains("\"unstaged\":[]") || out.stdout.contains("\"unstaged\": []"),
        "grit should not report false unstaged deletions for NFC index paths:\n{}",
        out.stdout
    );
}