diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:49:56 -0700 |
| commit | aec813062b340e6bb181470cf57cc4b4406e1bb8 (patch) | |
| tree | bb2b33ca6b89fdfd8d0e4b2e6d34f5a806674b67 /builtin-count-objects.c | |
| parent | 8f4cc7911955a3642af601394a4b4473e7bfde33 (diff) | |
| parent | 69e020ae00ebd3f7ae3c2f35acb139361417ef64 (diff) | |
| download | git-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.gz git-aec813062b340e6bb181470cf57cc4b4406e1bb8.tar.xz | |
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack:
is_kept_pack(): final clean-up
Simplify is_kept_pack()
Consolidate ignore_packed logic more
has_sha1_kept_pack(): take "struct rev_info"
has_sha1_pack(): refactor "pretend these packs do not exist" interface
git-repack: resist stray environment variable
Diffstat (limited to 'builtin-count-objects.c')
| -rw-r--r-- | builtin-count-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-count-objects.c b/builtin-count-objects.c index 62fd1f096..b814fe507 100644 --- a/builtin-count-objects.c +++ b/builtin-count-objects.c @@ -60,7 +60,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose, hex[40] = 0; if (get_sha1_hex(hex, sha1)) die("internal error"); - if (has_sha1_pack(sha1, NULL)) + if (has_sha1_pack(sha1)) (*packed_loose)++; } } |