diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
| commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
| tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/gix-index/src/decode/entries.rs | |
| parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
| download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-index/src/decode/entries.rs')
| -rw-r--r-- | vendor/gix-index/src/decode/entries.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gix-index/src/decode/entries.rs b/vendor/gix-index/src/decode/entries.rs index 0a968ae0c..5de949fe1 100644 --- a/vendor/gix-index/src/decode/entries.rs +++ b/vendor/gix-index/src/decode/entries.rs @@ -98,7 +98,7 @@ fn load_one<'a>( let (size, data) = read_u32(data)?; let (hash, data) = split_at_pos(data, hash_len)?; let (flags, data) = read_u16(data)?; - let flags = entry::at_rest::Flags::from_bits(flags)?; + let flags = entry::at_rest::Flags::from_bits_retain(flags); let (flags, data) = if flags.contains(entry::at_rest::Flags::EXTENDED) { let (extended_flags, data) = read_u16(data)?; let extended_flags = entry::at_rest::FlagsExtended::from_bits(extended_flags)?; @@ -142,11 +142,11 @@ fn load_one<'a>( Some(( Entry { stat: entry::Stat { - ctime: entry::Time { + ctime: entry::stat::Time { secs: ctime_secs, nsecs: ctime_nsecs, }, - mtime: entry::Time { + mtime: entry::stat::Time { secs: mtime_secs, nsecs: mtime_nsecs, }, |