From: Junio C Hamano <junkio@cox.net>
Date: Wed, 26 Apr 2006 06:50:48 +0000 (-0700)
Subject: Merge branch 'jc/diffstat' into next
X-Git-Tag: v1.4.1-rc1~181
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9849efb3211eefbb4d489d25360cd346d542a5ad?hp=-c

Merge branch 'jc/diffstat' into next

* jc/diffstat:
diff --stat: show complete rewrites consistently.
Makefile: remove and create libgit.a from scratch.
---

9849efb3211eefbb4d489d25360cd346d542a5ad
diff --combined Makefile
index 41a0d93a6c,087ff27c28..7ca38554ac
--- a/Makefile
+++ b/Makefile
@@@ -204,7 -204,7 +204,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o csum-file.o \
 +	blob.o commit.o connect.o csum-file.o cache-tree.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 \
@@@ -575,7 -575,7 +575,7 @@@ $(patsubst git-%$X,%.o,$(PROGRAMS)): $(
  $(DIFF_OBJS): diffcore.h
  
  $(LIB_FILE): $(LIB_OBJS)
- 	$(AR) rcs $@ $(LIB_OBJS)
+ 	rm -f $@ && $(AR) rcs $@ $(LIB_OBJS)
  
  XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
  
@@@ -611,12 -611,6 +611,12 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -665,7 -659,6 +665,7 @@@ clean
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f test-date$X test-delta$X test-gsimm$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz