diff options
| -rw-r--r-- | builtin-pack-objects.c | 12 | ||||
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | revision.h | 1 | ||||
| -rw-r--r-- | sha1_file.c | 24 |
4 files changed, 17 insertions, 21 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index fb5e14d56..7e7719b83 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1915,11 +1915,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs) const unsigned char *sha1; struct object *o; - for (i = 0; i < revs->num_ignore_packed; i++) { - if (matches_pack_name(p, revs->ignore_packed[i])) - break; - } - if (revs->num_ignore_packed <= i) + if (is_kept_pack(p, revs)) continue; if (open_pack_index(p)) die("cannot open pack index"); @@ -1955,11 +1951,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs) const unsigned char *sha1; for (p = packed_git; p; p = p->next) { - for (i = 0; i < revs->num_ignore_packed; i++) { - if (matches_pack_name(p, revs->ignore_packed[i])) - break; - } - if (revs->num_ignore_packed <= i) + if (is_kept_pack(p, revs)) continue; if (open_pack_index(p)) @@ -747,7 +747,6 @@ extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsign extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep); extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t); extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *); -extern int matches_pack_name(struct packed_git *p, const char *name); /* Dumb servers support */ extern int update_server_info(int); diff --git a/revision.h b/revision.h index 930429625..af414e5d9 100644 --- a/revision.h +++ b/revision.h @@ -159,5 +159,6 @@ enum commit_action { extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit); extern int has_sha1_kept_pack(const unsigned char *sha1, const struct rev_info *); +extern int is_kept_pack(const struct packed_git *, const struct rev_info *); #endif diff --git a/sha1_file.c b/sha1_file.c index f963c3cad..6e0a462f1 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1858,7 +1858,7 @@ off_t find_pack_entry_one(const unsigned char *sha1, return 0; } -int matches_pack_name(struct packed_git *p, const char *name) +static int matches_pack_name(const struct packed_git *p, const char *name) { const char *last_c, *c; @@ -1876,6 +1876,17 @@ int matches_pack_name(struct packed_git *p, const char *name) return 0; } +int is_kept_pack(const struct packed_git *p, const struct rev_info *revs) +{ + int i; + + for (i = 0; i < revs->num_ignore_packed; i++) { + if (matches_pack_name(p, revs->ignore_packed[i])) + return 0; + } + return 1; +} + static int find_pack_ent(const unsigned char *sha1, struct pack_entry *e, const struct rev_info *revs) { @@ -1889,15 +1900,8 @@ static int find_pack_ent(const unsigned char *sha1, struct pack_entry *e, p = (last_found == (void *)1) ? packed_git : last_found; do { - if (revs->ignore_packed) { - const char **ig; - for (ig = revs->ignore_packed; *ig; ig++) - if (matches_pack_name(p, *ig)) - break; - if (*ig) - goto next; - } - + if (revs->ignore_packed && !is_kept_pack(p, revs)) + goto next; if (p->num_bad_objects) { unsigned i; for (i = 0; i < p->num_bad_objects; i++) |