From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Nov 2024 05:42:58 +0000 (+0900)
Subject: Merge branch 'ps/cache-tree-w-broken-index-entry' into maint-2.47
X-Git-Tag: v2.47.1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=257f2de9644536964c02eed53271df89e132d4f4;p=thirdparty%2Fgit.git

Merge branch 'ps/cache-tree-w-broken-index-entry' into maint-2.47

Fail gracefully instead of crashing when attempting to write the
contents of a corrupt in-core index as a tree object.

* ps/cache-tree-w-broken-index-entry:
  unpack-trees: detect mismatching number of cache-tree/index entries
  cache-tree: detect mismatching number of index entries
  cache-tree: refactor verification to return error codes
---

257f2de9644536964c02eed53271df89e132d4f4
diff --cc cache-tree.c
index b482167a69,1e62567308..c595e86120
--- a/cache-tree.c
+++ b/cache-tree.c
@@@ -1,6 -1,8 +1,7 @@@
  #define USE_THE_REPOSITORY_VARIABLE
  
  #include "git-compat-util.h"
 -#include "environment.h"
+ #include "gettext.h"
  #include "hex.h"
  #include "lockfile.h"
  #include "tree.h"