diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-27 10:43:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 10:43:46 (GMT) |
| commit | 37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch) | |
| tree | 1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /builtin-upload-archive.c | |
| parent | 4bcb310c2539b66d535e87508d1b7a90fe29c083 (diff) | |
| parent | ae72f685418b79bbd67e1017c5b1ac7d731c042e (diff) | |
| download | git-37818d7db070f67a20df58ac7d5e04cc63ef1867.zip git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.gz git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.bz2 | |
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>
Diffstat (limited to 'builtin-upload-archive.c')
| -rw-r--r-- | builtin-upload-archive.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c index 45c92e1..e4156f8 100644 --- a/builtin-upload-archive.c +++ b/builtin-upload-archive.c @@ -1,9 +1,6 @@ /* * Copyright (c) 2006 Franck Bui-Huu */ -#include <time.h> -#include <sys/wait.h> -#include <sys/poll.h> #include "cache.h" #include "builtin.h" #include "archive.h" |