From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Mar 2006 21:10:50 +0000 (-0800)
Subject: Merge branch 'jc/fsck' into next
X-Git-Tag: v1.3.0-rc1~40
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b8cfe290a891611c15bbb79c412d16e57ae8784e;hp=-c;p=git.git

Merge branch 'jc/fsck' into next

* jc/fsck:
  fsck-objects: Remove --standalone
  refs.c::do_for_each_ref(): Finish error message lines with "\n"
  Nicer output from 'git'
  Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
  Remove trailing dot after short description
  Fix some inconsistencies in the docs
  contrib/git-svn: fix a harmless warning on rebuild (with old repos)
  contrib/git-svn: remove the --no-stop-on-copy flag
  contrib/git-svn: fix svn compat and fetch args
  Don't recurse into parents marked uninteresting.
  diff-delta: bound hash list length to avoid O(m*n) behavior
  test-delta needs zlib to compile
  git-fmt-merge-msg cleanup
---

b8cfe290a891611c15bbb79c412d16e57ae8784e
diff --combined Makefile
index 8e2a4967,e75a1ab8..006b2120
--- a/Makefile
+++ b/Makefile
@@@ -190,7 -190,7 +190,7 @@@ PYMODULES = 
  LIB_FILE=libgit.a
  
  LIB_H = \
 -	blob.h cache.h commit.h count-delta.h csum-file.h delta.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 \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
  
@@@ -200,7 -200,7 +200,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o count-delta.o csum-file.o \
 +	blob.o commit.o connect.o csum-file.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
  	quote.o read-cache.o refs.o run-command.o \
@@@ -452,10 -452,13 +452,13 @@@ all
  strip: $(PROGRAMS) git$X
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
- git$X: git.c $(LIB_FILE)
+ git$X: git.c common-cmds.h $(LIB_FILE)
  	$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
  		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE) $(LIBS)
  
+ common-cmds.h: Documentation/git-*.txt
+ 	./generate-cmdlist.sh > $@
+ 
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
  	rm -f $@
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
@@@ -564,7 -567,7 +567,7 @@@ test-date$X: test-date.c date.o ctype.
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
  
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
- 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
+ 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
@@@ -612,7 -615,7 +615,7 @@@ rpm: dis
  clean:
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
  	rm -f $(ALL_PROGRAMS) git$X
- 	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo
+ 	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	$(MAKE) -C Documentation/ clean