X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=read-cache.c;h=133f790fa4cd52e503da5ae6be3f78389f7674b7;hb=12a4aeaad8aa2071f9b20f6ac87454c5f6d2d4fb;hp=2c1409491d015c78a627348f36b83b21a2fec19a;hpb=424663d9c822454cc605c5bab22afdc8475de031;p=thirdparty%2Fgit.git

diff --git a/read-cache.c b/read-cache.c
index 2c1409491d..133f790fa4 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1276,7 +1276,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 	 */
 	if (istate->cache_nr > 0 &&
 		strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
-		pos = -istate->cache_nr - 1;
+		pos = index_pos_to_insert_pos(istate->cache_nr);
 	else
 		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
 
@@ -1915,7 +1915,7 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries)
 	/*
 	 * Account for potential alignment differences.
 	 */
-	per_entry += align_padding_size(sizeof(struct cache_entry), -sizeof(struct ondisk_cache_entry));
+	per_entry += align_padding_size(per_entry, 0);
 	return ondisk_size + entries * per_entry;
 }