merge-recursive: avoid triggering add_cacheinfo error with dirty mod

diff --git a/sha1_name.c b/sha1_name.c
index 509a95f0cfdcac749afd5d21469c9338025fedd7..5b93bf8da36939376b506f96624f568875397969 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -179,7 +179,6 @@ static void find_short_packed_object(struct disambiguate_state *ds)
 {
        struct packed_git *p;
 
-       prepare_packed_git();
        for (p = get_packed_git(the_repository); p && !ds->ambiguous;
             p = p->next)
                unique_in_pack(p, ds);
@@ -534,7 +533,6 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
 {
        struct packed_git *p;
 
-       prepare_packed_git();
        for (p = get_packed_git(the_repository); p; p = p->next)
                find_abbrev_len_for_pack(p, mad);
 }