From: Junio C Hamano <junkio@cox.net>
Date: Tue, 7 Nov 2006 23:39:56 +0000 (-0800)
Subject: Merge branch 'np/index-pack'
X-Git-Tag: v1.4.4-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41?hp=-c

Merge branch 'np/index-pack'

* np/index-pack:
remove .keep pack lock files when done with refs update
have index-pack create .keep file more carefully
improve fetch-pack's handling of kept packs
git-fetch can use both --thin and --keep with fetch-pack now
Teach receive-pack how to keep pack files based on object count.
Allow pack header preprocessing before unpack-objects/index-pack.
Remove unused variable in receive-pack.
Revert "send-pack --keep: do not explode into loose objects on the receiving end."
missing small substitution
Teach git-index-pack how to keep a pack file.
Only repack active packs by skipping over kept packs.
Allow short pack names to git-pack-objects --unpacked=.
send-pack --keep: do not explode into loose objects on the receiving end.
index-pack: minor fixes to comment and function name
enhance clone and fetch -k experience
mimic unpack-objects when --stdin is used with index-pack
add progress status to index-pack
make index-pack able to complete thin packs.
enable index-pack streaming capability
---

66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41
diff --combined Makefile
index 2af4eb31ce,9bf50bcf24..6d324fb56e
--- a/Makefile
+++ b/Makefile
@@@ -187,12 -187,15 +187,12 @@@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH
  	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	  git-cherry-pick git-status git-instaweb
  
 -# The ones that do not have to link with lcrypto, lz nor xdiff.
 -SIMPLE_PROGRAMS = \
 -	git-daemon$X
 -
  # ... and all the rest that could be moved out of bindir to gitexecdir
  PROGRAMS = \
  	git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
  	git-merge-base$X \
 +	git-daemon$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
  	git-peek-remote$X git-receive-pack$X \
  	git-send-pack$X git-shell$X \
@@@ -214,7 -217,7 +214,7 @@@ BUILT_INS = 
  	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
 -ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \
 +ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) \
  	git-merge-recur$X
  
  # Backward compatibility -- to be removed after 1.0
@@@ -257,7 -260,7 +257,7 @@@ LIB_OBJS = 
  	quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
  	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 \
+ 	revision.o pager.o tree-walk.o xdiff-interface.o \
  	write_or_die.o trace.o list-objects.o grep.o \
  	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
  	color.o wt-status.o archive-zip.o archive-tar.o
@@@ -483,9 -486,11 +483,9 @@@ ifdef NEEDS_LIBICON
  endif
  ifdef NEEDS_SOCKET
  	EXTLIBS += -lsocket
 -	SIMPLE_LIB += -lsocket
  endif
  ifdef NEEDS_NSL
  	EXTLIBS += -lnsl
 -	SIMPLE_LIB += -lnsl
  endif
  ifdef NO_D_TYPE_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
@@@ -732,6 -737,11 +732,6 @@@ endi
  git-%$X: %.o $(GITLIBS)
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 -$(SIMPLE_PROGRAMS) : $(LIB_FILE)
 -$(SIMPLE_PROGRAMS) : git-%$X : %.o
 -	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 -		$(LIB_FILE) $(SIMPLE_LIB)
 -
  ssh-pull.o: ssh-fetch.c
  ssh-push.o: ssh-upload.c
  git-local-fetch$X: fetch.o
@@@ -932,8 -942,3 +932,8 @@@ check-docs:
  		*) echo "no link: $$v";; \
  		esac ; \
  	done | sort
 +
 +### Make sure built-ins do not have dups and listed in git.c
 +#
 +check-builtins::
 +	./check-builtins.sh