From: Taylor Blau <me@ttaylorr.com>
Date: Tue, 22 Oct 2024 18:40:38 +0000 (-0400)
Subject: Merge branch 'ps/cache-tree-w-broken-index-entry'
X-Git-Tag: v2.48.0-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ca9a05e63608a386f9dec50110725954c41216a;p=thirdparty%2Fgit.git

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

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
---

6ca9a05e63608a386f9dec50110725954c41216a
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"