Merge commit '379240e2e48a2006b17f453714443bb0a52093c3'

This commit is contained in:
Roman Perepelitsa 2026-09-06 23:00:14 +02:00
commit d05a1b00f9
2 changed files with 3 additions and 4 deletions

View file

@ -420,7 +420,7 @@ function gitstatus_query() {
VCS_STATUS_COMMIT_SUMMARY="${resp[28]-}" VCS_STATUS_COMMIT_SUMMARY="${resp[28]-}"
VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 0)) VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 0))
if (( _GITSTATUS_DIRTY_MAX_INDEX_SIZE >= 0 && if (( _GITSTATUS_DIRTY_MAX_INDEX_SIZE >= 0 &&
VCS_STATUS_INDEX_SIZE > _GITSTATUS_DIRTY_MAX_INDEX_SIZE_ )); then VCS_STATUS_INDEX_SIZE > _GITSTATUS_DIRTY_MAX_INDEX_SIZE )); then
VCS_STATUS_HAS_UNSTAGED=-1 VCS_STATUS_HAS_UNSTAGED=-1
VCS_STATUS_HAS_CONFLICTED=-1 VCS_STATUS_HAS_CONFLICTED=-1
VCS_STATUS_HAS_UNTRACKED=-1 VCS_STATUS_HAS_UNTRACKED=-1

View file

@ -151,7 +151,7 @@ class Arena {
return DirectInit<std::remove_const_t<std::remove_reference_t<T>>>(std::forward<T>(val)); return DirectInit<std::remove_const_t<std::remove_reference_t<T>>>(std::forward<T>(val));
} }
// The same as `new T{args...}` but on the arena. // The same as `new T(args...)` but on the arena.
template <class T, class... Args> template <class T, class... Args>
inline T* DirectInit(Args&&... args) { inline T* DirectInit(Args&&... args) {
T* res = Allocate<T>(); T* res = Allocate<T>();
@ -159,7 +159,7 @@ class Arena {
return res; return res;
} }
// The same as `new T(args...)` but on the arena. // The same as `new T{args...}` but on the arena.
template <class T, class... Args> template <class T, class... Args>
inline T* BraceInit(Args&&... args) { inline T* BraceInit(Args&&... args) {
T* res = Allocate<T>(); T* res = Allocate<T>();
@ -194,7 +194,6 @@ class Arena {
inline static size_t Align(size_t n, size_t m) { return (n + m - 1) & ~(m - 1); }; inline static size_t Align(size_t n, size_t m) { return (n + m - 1) & ~(m - 1); };
void AddBlock(size_t size, size_t alignment); void AddBlock(size_t size, size_t alignment);
bool ReuseBlock(size_t size, size_t alignment);
__attribute__((noinline)) void* AllocateSlow(size_t size, size_t alignment); __attribute__((noinline)) void* AllocateSlow(size_t size, size_t alignment);