diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-05-30 02:12:28 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-29 23:30:11 -0700 |
| commit | eaa867703927c1f383637979d16c40d996cea240 (patch) | |
| tree | 482ee4084d7a9b3792129bdbc26227eebf0536b7 | |
| parent | Test for recent rev-parse $abbrev_sha1 regression (diff) | |
| download | tgif-eaa867703927c1f383637979d16c40d996cea240.tar.xz | |
Simplify index access condition in count-objects, pack-redundant
My earlier lazy index opening patch changed this condition to check
index_data and call open_pack_index if it was NULL. In truth we only
care about num_objects. Since open_pack_index does no harm if the
index is already open, and all indexes are likely to be closed in
this application, the "performance optimization" of inlining the
index_data check here was wrong.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-count-objects.c | 2 | ||||
| -rw-r--r-- | pack-redundant.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin-count-objects.c b/builtin-count-objects.c index ac65e03e7f..4274ec1950 100644 --- a/builtin-count-objects.c +++ b/builtin-count-objects.c @@ -111,7 +111,7 @@ int cmd_count_objects(int ac, const char **av, const char *prefix) for (p = packed_git; p; p = p->next) { if (!p->pack_local) continue; - if (!p->index_data && open_pack_index(p)) + if (open_pack_index(p)) continue; packed += p->num_objects; num_pack++; diff --git a/pack-redundant.c b/pack-redundant.c index 06173206f0..6bc3bdf3f4 100644 --- a/pack-redundant.c +++ b/pack-redundant.c @@ -550,7 +550,7 @@ static struct pack_list * add_pack(struct packed_git *p) l.pack = p; llist_init(&l.all_objects); - if (!p->index_data && open_pack_index(p)) + if (open_pack_index(p)) return NULL; base = p->index_data; |