diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 16:07:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 16:07:30 -0800 |
| commit | c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319 (patch) | |
| tree | 637f16f49f172a279356b66fd2445f8db69515bf /Makefile | |
| parent | 859c4fbef589841585f8f21cc567b7016681df7a (diff) | |
| parent | 5f4347bba39ddb147b06913ac263fc46954d2d0b (diff) | |
| download | git-c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319.tar.gz git-c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319.tar.xz | |
Merge branch 'np/verify-pack'
* np/verify-pack:
add storage size output to 'git verify-pack -v'
fix unimplemented packed_object_info_detail() features
make verify_one_pack() a bit less wrong wrt packed_git structure
factorize revindex code out of builtin-pack-objects.c
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -304,7 +304,8 @@ LIB_H = \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \ utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \ - mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h + mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h \ + pack-revindex.h DIFF_OBJS = \ diff.o diff-lib.o diffcore-break.o diffcore-order.o \ @@ -328,7 +329,7 @@ LIB_OBJS = \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \ - alias.o fsck.o + alias.o fsck.o pack-revindex.o BUILTIN_OBJS = \ builtin-add.o \ |