aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-07 15:39:56 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-07 15:39:56 -0800
commit66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41 (patch)
tree22a97be6b9d0a9c456b8298bb1bf1e25fa882511 /Makefile
parentbd45fec8397f1f0804db1d18af7193be323b0326 (diff)
parent576162a45f35e157427300066b0ff566ff698a0f (diff)
downloadgit-66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41.tar.gz
git-66f3b35fde42b9a235d8fd1c4d4a80f94bfd6a41.tar.xz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2af4eb31c..6d324fb56 100644
--- a/Makefile
+++ b/Makefile
@@ -257,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