diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-21 00:40:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-21 00:40:28 -0700 |
| commit | eaf12a8c7d844be947c29954b658c17996abcd25 (patch) | |
| tree | 11bac4c4b10036374b5cc6736fcdf7eee2054c58 /builtin-count-objects.c | |
| parent | 9c13359aaf3176428603cc9dfbdf30da889ab3d3 (diff) | |
| parent | 968846015229fe0fec28e3c85db722e131c15f93 (diff) | |
| download | git-eaf12a8c7d844be947c29954b658c17996abcd25.tar.gz | |
Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
* lt/refs: (58 commits)
git-pack-refs --prune
pack-refs: do not pack symbolic refs.
Tell between packed, unpacked and symbolic refs.
Add callback data to for_each_ref() family.
symbolit-ref: fix resolve_ref conversion.
Fix broken sha1 locking
fsck-objects: adjust to resolve_ref() clean-up.
gitignore: git-pack-refs is a generated file.
wt-status: use simplified resolve_ref to find current branch
Fix t1400-update-ref test minimally
Enable the packed refs file format
Make ref resolution saner
Add support for negative refs
Start handling references internally as a sorted in-memory list
gitweb fix validating pg (page) parameter
git-repack(1): document --window and --depth
git-apply(1): document --unidiff-zero
gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export
upload-archive: monitor child communication even more carefully.
gitweb: export options
...
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 1d3729aa99..73c5982423 100644 --- a/builtin-count-objects.c +++ b/builtin-count-objects.c @@ -62,7 +62,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)) + if (has_sha1_pack(sha1, NULL)) (*packed_loose)++; } } |