Merge branch 'master' into js/shallow

This is to adjust to: count-objects -v: show number of packs as well. which will break a test in this series. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-27 02:43:46 -08:00
parent 4bcb310c25 ae72f68541
commit 37818d7db0
226 changed files with 9285 additions and 6237 deletions
--- a/upload-pack.c
+++ b/upload-pack.c
@ -1,6 +1,3 @@
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/poll.h>
 #include "cache.h"
 #include "refs.h"
 #include "pkt-line.h"