Merge branch 'jc/pack'
authorJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:32:03 +0000 (18:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:32:03 +0000 (18:32 -0700)
* jc/pack:
  pack-objects: document --revs, --unpacked and --all.
  pack-objects --unpacked=<existing pack> option.
  pack-objects: further work on internal rev-list logic.
  pack-objects: run rev-list equivalent internally.
  Separate object listing routines out of rev-list

1  2 
Makefile
cache.h
sha1_file.c

diff --cc Makefile
index 69915d865168817f72c084f15930e41bf5b9ad45,18cd79e7c065df505d412e9490585ef4f769309b..8467447da90f04cc55d1403ea102c6335331aa52
+++ b/Makefile
@@@ -234,8 -232,8 +234,8 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
 -      blob.h cache.h commit.h csum-file.h delta.h \
 -      diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h \
 +      archive.h blob.h cache.h commit.h csum-file.h delta.h \
-       diff.h object.h pack.h pkt-line.h quote.h refs.h sideband.h \
++      diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.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
  
@@@ -252,9 -250,8 +252,9 @@@ LIB_OBJS = 
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
-       write_or_die.o trace.o \
+       write_or_die.o trace.o list-objects.o \
 -      alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS)
 +      alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
 +      color.o wt-status.o
  
  BUILTIN_OBJS = \
        builtin-add.o \
diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge