From: Junio C Hamano <junkio@cox.net>
Date: Sat, 29 Apr 2006 05:42:41 +0000 (-0700)
Subject: Merge branch 'np/delta' into next
X-Git-Tag: v1.4.1-rc1~165
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4623d43de5035c9a3ec91d197c9f1904c0f63953;p=git.git

Merge branch 'np/delta' into next

* np/delta:
  replace adler32 with Rabin's polynomial in diff-delta
---

4623d43de5035c9a3ec91d197c9f1904c0f63953
diff --cc Makefile
index 4416af9bb,38c980bfb..576067faf
--- a/Makefile
+++ b/Makefile
@@@ -609,11 -609,8 +609,11 @@@ 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) $^ -lz
+ 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done