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
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
//! What:
//! `git reset <tree> -- <paths>` on an index held in memory: for every path the literal pathspecs name, the entries of the
//! index become the entries of the tree, as `update_index_from_diff` in `builtin/reset.c` leaves them.
//! Why:
//! A mixed reset with paths compares the tree with the index (`diff_cache` in `diff-lib.c`) and, for each difference,
//! removes the index entry (`remove_file_from_index`) or adds an entry made from the tree's mode and object name with
//! all-zero stat data (`make_cache_entry`, `add_index_entry` in `read-cache.c`), so the next `git status` hashes the file.
//! Every extension a change touches follows Git: the cache-tree is invalidated, the untracked cache is cleared for the
//! path, removed unmerged entries go to resolve-undo, and the fsmonitor bitmap lists the new entries as dirty. A form whose
//! result depends on more than that (a file-directory conflict between the tree and the index, a name Git refuses, a racily
//! clean entry that Git would hash from the worktree) returns `None`, so Git answers.
//!
//! In TS you'd write (pseudocode):
//! ```ts
//! const done: boolean = resetPaths(index, names, treeEntries, settings, timestampSeconds); // false: ask Git
//! ```
use super::index_full::{FullEntry, FullIndex, SKIP_WORKTREE};
use super::index_settings::{IndexSettings, UntrackedMode};
use super::index_stat::StatData;
use super::repo_read_tree::{FlatEntry, MODE_GITLINK};
/// The mode a regular file with an executable bit gets in the index.
const MODE_EXECUTABLE: u32 = 0o100_755;
/// The mode of a regular file in the index.
const MODE_FILE: u32 = 0o100_644;
/// The mode of a symbolic link.
const MODE_LINK: u32 = 0o120_000;
/// What `create_ce_mode` makes of a tree entry's mode.
fn index_mode(mode: u32) -> u32 {
if mode & 0o170_000 == MODE_LINK {
return MODE_LINK;
}
if mode & 0o170_000 == 0o040_000 || mode & 0o170_000 == MODE_GITLINK {
return MODE_GITLINK;
}
return if mode & 0o100 != 0 { MODE_EXECUTABLE } else { MODE_FILE };
}
/// Whether `rest` is only the spaces and dots NTFS drops from the end of a name.
fn only_spaces_and_dots(rest: &[u8]) -> bool {
return rest.iter().all(|byte| { return *byte == b' ' || *byte == b'.'; });
}
/// What:
/// Git's `is_ntfs_dotgitmodules` (`path.c:1451-1522`, `is_ntfs_dot_generic` with the name `gitmodules` and the hashed short-name
/// prefix `gi7eba`) for one path component: `.gitmodules`, its short form `gitmod~1` to `gitmod~4`, and the fall-back short name
/// NTFS makes from the hash (`GI7EBA~1`), each followed only by spaces and dots or a stream.
/// Why:
/// A link with any of these names is refused by Git with the NTFS protection on, so the update must decline it.
///
/// In TS you'd write (pseudocode):
/// ```ts
/// const refused: boolean = isNtfsDotGitmodules(component);
/// ```
fn is_ntfs_dotgitmodules(name: &[u8]) -> bool {
// The component ends where Git's string would: a position past the end reads as the terminating NUL.
let at = |index: usize| -> u8 { return name.get(index).copied().unwrap_or(0); };
let spaces_and_periods = |start: usize| -> bool {
for index in start.. {
let byte: u8 = at(index);
if byte == 0 || byte == b':' {
return true;
}
if byte != b' ' && byte != b'.' {
return false;
}
}
return false;
};
if at(0) == b'.' && name.len() > 10 && name[1..11].eq_ignore_ascii_case(b"gitmodules") {
return spaces_and_periods(11);
}
if name.len() > 5 && name[..6].eq_ignore_ascii_case(b"gitmod") && at(6) == b'~' && (b'1'..=b'4').contains(&at(7)) {
return spaces_and_periods(8);
}
let (mut index, mut saw_tilde): (usize, bool) = (0, false);
while index < 8 {
let byte: u8 = at(index);
if byte == 0 {
return false;
} else if saw_tilde {
if !byte.is_ascii_digit() {
return false;
}
} else if byte == b'~' {
index += 1;
if !(b'1'..=b'9').contains(&at(index)) {
return false;
}
saw_tilde = true;
} else if index >= 6 || byte & 0x80 != 0 || byte.to_ascii_lowercase() != b"gi7eba"[index] {
return false;
}
index += 1;
}
return spaces_and_periods(8);
}
/// What:
/// Whether one path component is one Git's name checks (`verify_path_internal` in `read-cache.c` with `core.protectNTFS`,
/// which is on by default, and `core.protectHFS`) cannot refuse or alias to a refused name.
/// Why:
/// Git refuses `.`, `..` and `.git` in any case; with the protections on it also refuses the spellings a file system folds
/// to `.git` (trailing spaces and dots, the `::$INDEX_ALLOCATION` stream, `git~1`, the ignorable characters of a case-folding
/// disk) and, for a link, the same spellings of `.gitmodules` (`is_ntfs_dotgit`, `is_ntfs_dotgitmodules`, `is_hfs_dotgit`,
/// `is_hfs_dotgitmodules` in `path.c` and `utf8.c`). A backslash and a colon separate or open a stream on those disks. This
/// declines every such spelling whatever the settings say, which is a superset of what Git refuses with them on, so the
/// update never writes a name Git would not and Git answers the rest.
///
/// In TS you'd write (pseudocode):
/// ```ts
/// const plain = (component, isLink) => !/[\\:]/.test(component) && !aliasesDotGit(component) && !(isLink && aliasesDotGitmodules(component));
/// ```
fn component_is_plain(component: &[u8], is_link: bool) -> bool {
let lowered: Vec<u8> = component.to_ascii_lowercase();
let dot_git_like: bool = lowered.strip_prefix(b".git").is_some_and(only_spaces_and_dots);
let dot_gitmodules_like: bool = is_link && (is_ntfs_dotgitmodules(component) || lowered.strip_prefix(b".gitmodules").is_some_and(only_spaces_and_dots) || lowered.starts_with(b"gitmod~"));
// The ignorable characters of a case-folding disk: U+2000 to U+206F begin with E2 80 or E2 81, and U+FEFF is EF BB BF.
let ignorable: bool = component.windows(2).any(|pair| { return pair == [0xe2, 0x80] || pair == [0xe2, 0x81]; }) || component.windows(3).any(|triple| { return triple == [0xef, 0xbb, 0xbf]; });
let separators: bool = component.contains(&b'\\') || component.contains(&b':');
return !component.is_empty() && component != b"." && component != b".." && !separators && !dot_git_like && !dot_gitmodules_like && !lowered.starts_with(b"git~") && !ignorable;
}
/// Whether Git could refuse the path or treat it specially on a file system that folds names; those paths are left to Git.
fn path_is_plain(path: &[u8], mode: u32) -> bool {
if path.is_empty() {
return false;
}
return path.split(|byte| { return *byte == b'/'; }).all(|component| { return component_is_plain(component, mode & 0o170_000 == MODE_LINK); });
}
/// Whether the path is one a literal pathspec `name` selects: the name itself or anything below it.
fn selected(path: &[u8], names: &[Vec<u8>]) -> bool {
return names.iter().any(|name| { return path == name.as_slice() || (path.starts_with(name.as_slice()) && path.get(name.len()) == Some(&b'/')); });
}
/// The position of the first entry whose path is not before `path`.
fn first_at(entries: &[FullEntry], path: &[u8]) -> usize {
return entries.partition_point(|entry| { return entry.path.as_slice() < path; });
}
/// Whether the index holds an entry below the directory `path/` or at one of the directories above `path`.
fn has_directory_conflict(entries: &[FullEntry], path: &[u8]) -> bool {
let mut below: Vec<u8> = path.to_vec();
below.push(b'/');
let start: usize = first_at(entries, below.as_slice());
if entries.get(start).is_some_and(|entry| { return entry.path.starts_with(below.as_slice()); }) {
return true;
}
return path.iter().enumerate().filter(|(_, byte)| { return **byte == b'/'; }).any(|(slash, _)| {
let above: &[u8] = &path[..slash];
let at: usize = first_at(entries, above);
return entries.get(at).is_some_and(|entry| { return entry.path.as_slice() == above; });
});
}
/// Everything the changes to one index need besides the index.
struct Edit<'a> {
/// The index being changed.
index: &'a mut FullIndex,
/// What Git's configuration makes of the extensions.
settings: IndexSettings,
}
impl Edit<'_> {
/// Clear the untracked cache for `path`, if there is one (`untracked_cache_invalidate_path`).
fn forget_untracked(&mut self, path: &[u8]) {
if let Some(cache) = self.index.untracked.as_mut() {
cache.invalidate_path(path);
}
}
/// Take the entries named `path` out of the index, remembering unmerged ones for resolve-undo (`remove_index_entry_at`).
fn take_entries(&mut self, path: &[u8]) {
let start: usize = first_at(self.index.entries.as_slice(), path);
while self.index.entries.get(start).is_some_and(|entry| { return entry.path.as_slice() == path; }) {
let gone: FullEntry = self.index.entries.remove(start);
if gone.stage() != 0 {
self.index.resolve_undo.get_or_insert_with(Default::default).record(gone.path.as_slice(), gone.stage(), gone.mode, gone.id.as_slice());
}
}
}
/// `remove_file_from_index`.
fn remove(&mut self, path: &[u8]) {
if let Some(tree) = self.index.cache_tree.as_mut() {
tree.invalidate(path);
}
self.forget_untracked(path);
self.take_entries(path);
}
/// `add_index_entry` with the add and replace options, for an entry made from the tree.
fn put(&mut self, wanted: &FlatEntry) {
let path: &[u8] = wanted.path.as_slice();
if let Some(tree) = self.index.cache_tree.as_mut() {
tree.invalidate(path);
}
let start: usize = first_at(self.index.entries.as_slice(), path);
let existing: Option<usize> = self.index.entries.get(start).filter(|entry| { return entry.path.as_slice() == path && entry.stage() == 0; }).map(|_| { return start; });
// An entry that was outside the checkout stays outside it.
let skip: u16 = existing.map_or(0, |at| { return self.index.entries[at].extended & SKIP_WORKTREE; });
let made: FullEntry = FullEntry {
stat: StatData::default(),
mode: index_mode(wanted.mode),
id: wanted.id.clone(),
flags: 0,
extended: skip,
path: wanted.path.clone(),
monitor_valid: false,
};
if let Some(at) = existing {
self.index.entries[at] = made;
// Replacing an entry clears the untracked cache only when fsmonitor is on (`mark_fsmonitor_invalid`).
if self.settings.monitor {
self.forget_untracked(path);
}
return;
}
self.forget_untracked(path);
// A resolved entry replaces every unmerged entry of the path.
self.take_entries(path);
let at: usize = first_at(self.index.entries.as_slice(), path);
self.index.entries.insert(at, made);
}
}
/// What the reader of the extensions must settle before the entries change: fsmonitor and the untracked cache as Git's read
/// leaves them. `None` for a combination this update does not reproduce.
fn prepare_extensions(index: &mut FullIndex, settings: IndexSettings) -> Option<()> {
if settings.monitor {
let dirty: Vec<usize> = index.fsmonitor.as_ref()?.dirty.clone();
if dirty.iter().any(|position| { return *position >= index.entries.len(); }) {
return None;
}
for entry in &mut index.entries {
entry.monitor_valid = entry.mode != MODE_GITLINK;
}
for position in dirty {
index.entries[position].monitor_valid = false;
}
} else {
index.fsmonitor = None;
}
match settings.untracked {
UntrackedMode::Keep => {}
UntrackedMode::Write => {
index.untracked.as_ref()?;
}
UntrackedMode::Remove => index.untracked = None,
}
return Some(());
}
/// What:
/// Make the entries of `names` (and below) equal to `tree`'s, as `git reset <tree> -- <names>` does; `tree` holds the
/// tree's entries under those names in path order. `None` when the result is not the plain case described above, with the
/// index then in an unspecified state.
/// Why:
/// `timestamp_seconds` is the index file's modification time: an entry that stays and was recorded in that second or later
/// is racily clean, and Git would compare it with the worktree while writing, which this update does not.
///
/// In TS you'd write (pseudocode):
/// ```ts
/// function resetPaths(index: FullIndex, names: Uint8Array[], tree: FlatEntry[], settings: IndexSettings, timestampSeconds: number): void | undefined;
/// ```
pub fn reset_paths(index: &mut FullIndex, names: &[Vec<u8>], tree: &[FlatEntry], settings: IndexSettings, timestamp_seconds: u32) -> Option<()> {
if names.iter().any(|name| { return !path_is_plain(name.as_slice(), 0) || name.last() == Some(&b'/'); }) {
return None;
}
prepare_extensions(index, settings)?;
// The paths that differ, in path order: each is in the tree, the index or both.
let mut paths: Vec<Vec<u8>> = tree.iter().map(|entry| { return entry.path.clone(); }).collect();
paths.extend(index.entries.iter().filter(|entry| { return selected(entry.path.as_slice(), names); }).map(|entry| { return entry.path.clone(); }));
paths.sort();
paths.dedup();
let mut edit: Edit<'_> = Edit { index, settings };
for path in paths {
let wanted: Option<&FlatEntry> = tree.binary_search_by(|entry| { return entry.path.cmp(&path); }).ok().map(|at| { return &tree[at]; });
let start: usize = first_at(edit.index.entries.as_slice(), path.as_slice());
let held: Vec<&FullEntry> = edit.index.entries[start..].iter().take_while(|entry| { return entry.path == path; }).collect();
match wanted {
None => edit.remove(path.as_slice()),
Some(entry) => {
// The same mode and object name is no difference, whatever the flags of the index entry say.
let same: bool = matches!(held.as_slice(), [only] if only.stage() == 0 && only.mode == index_mode(entry.mode) && only.id == entry.id);
if same {
continue;
}
if !path_is_plain(entry.path.as_slice(), index_mode(entry.mode)) || has_directory_conflict(edit.index.entries.as_slice(), entry.path.as_slice()) {
return None;
}
edit.put(entry);
}
}
}
// Git hashes a racily clean entry from the worktree when it writes the index; that is left to Git.
let racy: bool = index.entries.iter().any(|entry| { return entry.mode != MODE_GITLINK && timestamp_seconds <= entry.stat.mtime_sec; });
if racy {
return None;
}
return Some(());
}
#[cfg(test)]
#[path = "index_reset_tests.rs"]
mod tests;