From 379240e2e48a2006b17f453714443bb0a52093c3 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Sun, 6 Sep 2026 23:00:14 +0200 Subject: [PATCH] Squashed 'gitstatus/' changes from 39d34dff..7822a026 7822a026 Fix typo in use of _GITSTATUS_DIRTY_MAX_INDEX_SIZE (#499) f9f05e8d fix comments; delete dead code git-subtree-dir: gitstatus git-subtree-split: 7822a026b77fb810e74055836d62cbe5b133eade --- gitstatus.plugin.sh | 2 +- src/arena.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gitstatus.plugin.sh b/gitstatus.plugin.sh index bfe16dc2..2d5fdf08 100644 --- a/gitstatus.plugin.sh +++ b/gitstatus.plugin.sh @@ -420,7 +420,7 @@ function gitstatus_query() { VCS_STATUS_COMMIT_SUMMARY="${resp[28]-}" VCS_STATUS_HAS_STAGED=$((VCS_STATUS_NUM_STAGED > 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_CONFLICTED=-1 VCS_STATUS_HAS_UNTRACKED=-1 diff --git a/src/arena.h b/src/arena.h index 96873852..822f73be 100644 --- a/src/arena.h +++ b/src/arena.h @@ -151,7 +151,7 @@ class Arena { return DirectInit>>(std::forward(val)); } - // The same as `new T{args...}` but on the arena. + // The same as `new T(args...)` but on the arena. template inline T* DirectInit(Args&&... args) { T* res = Allocate(); @@ -159,7 +159,7 @@ class Arena { return res; } - // The same as `new T(args...)` but on the arena. + // The same as `new T{args...}` but on the arena. template inline T* BraceInit(Args&&... args) { T* res = Allocate(); @@ -194,7 +194,6 @@ class Arena { 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); - bool ReuseBlock(size_t size, size_t alignment); __attribute__((noinline)) void* AllocateSlow(size_t size, size_t alignment);