From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Tue, 5 Jul 2005 13:32:29 +0000 (+0200)
Subject: Merge with Linus' current tree
X-Git-Tag: v0.99~71^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba?ds=inline;hp=-c

Merge with Linus' current tree
---

f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba
diff --combined Makefile
index a833a85618,9379e16bb1..233d24afad
--- a/Makefile
+++ b/Makefile
@@@ -20,18 -20,12 +20,18 @@@ CC=gc
  AR=ar
  INSTALL=install
  
 +#
 +# sparse is architecture-neutral, which means that we need to tell it
 +# explicitly what architecture to check for. Fix this up for yours..
 +#
 +SPARSE_FLAGS=-D__BIG_ENDIAN__ -D__powerpc__
 +
  SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
  	git-pull-script git-tag-script git-resolve-script git-whatchanged \
  	git-fetch-script git-status-script git-commit-script \
  	git-log-script git-shortlog git-cvsimport-script git-diff-script \
  	git-reset-script git-add-script git-checkout-script git-clone-script \
 -	gitk git-cherry git-rebase-script git-relink-script
 +	gitk git-cherry git-rebase-script git-relink-script git-repack-script
  
  PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
  	git-read-tree git-commit-tree git-cat-file git-fsck-cache \
@@@ -40,10 -34,9 +40,10 @@@
  	git-unpack-file git-export git-diff-cache git-convert-cache \
  	git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
  	git-diff-helper git-tar-tree git-local-pull git-write-blob \
- 	git-get-tar-commit-id git-apply git-stripspace git-cvs2git \
+ 	git-get-tar-commit-id git-apply git-stripspace \
 -	git-diff-stages git-rev-parse git-patch-id \
 -	git-pack-objects git-unpack-objects
 +	git-diff-stages git-rev-parse git-patch-id git-pack-objects \
 +	git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
 +	git-prune-packed git-fetch-pack git-upload-pack
  
  all: $(PROG)
  
@@@ -52,10 -45,9 +52,10 @@@ install: $(PROG) $(SCRIPTS
  
  LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
  	 tag.o date.o index.o diff-delta.o patch-delta.o entry.o \
 -	 epoch.o refs.o csum-file.o
 +	 epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o
  LIB_FILE=libgit.a
 -LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
 +LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
 +	pack.h pkt-line.h refs.h
  
  LIB_H += strbuf.h
  LIB_OBJS += strbuf.o
@@@ -87,9 -79,6 +87,9 @@@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)
  $(LIB_FILE): $(LIB_OBJS)
  	$(AR) rcs $@ $(LIB_OBJS)
  
 +check:
 +	for i in *.c; do sparse $(CFLAGS) $(SPARSE_FLAGS) $$i; done
 +
  test-date: test-date.c date.o
  	$(CC) $(CFLAGS) -o $@ test-date.c date.o
  
@@@ -129,17 -118,11 +129,16 @@@ git-diff-helper: diff-helper.
  git-tar-tree: tar-tree.c
  git-write-blob: write-blob.c
  git-stripspace: stripspace.c
- git-cvs2git: cvs2git.c
  git-diff-stages: diff-stages.c
  git-rev-parse: rev-parse.c
  git-patch-id: patch-id.c
  git-pack-objects: pack-objects.c
  git-unpack-objects: unpack-objects.c
 +git-verify-pack: verify-pack.c
 +git-receive-pack: receive-pack.c
 +git-send-pack: send-pack.c
 +git-prune-packed: prune-packed.c
 +git-fetch-pack: fetch-pack.c
  
  git-http-pull: LIBS += -lcurl
  git-rev-list: LIBS += -lssl