diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-03 03:14:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-03 03:16:52 -0700 |
| commit | f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc (patch) | |
| tree | e8379d2e091dcdabb623ebbe8b7a1ee53be308a9 /upload-pack.c | |
| parent | 160b7983034cdd24ea1bf6ef7a2532a2296461c6 (diff) | |
| parent | 8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce (diff) | |
| download | git-f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc.tar.gz | |
Merge branch 'master' into js/merge-base
This is to pull in the object-hash clean-up from the master branch.
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index 2b70c3dcb4..b18eb9ba0d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1,3 +1,6 @@ +#include <signal.h> +#include <sys/wait.h> +#include <sys/poll.h> #include "cache.h" #include "refs.h" #include "pkt-line.h" @@ -5,9 +8,6 @@ #include "object.h" #include "commit.h" #include "exec_cmd.h" -#include <signal.h> -#include <sys/poll.h> -#include <sys/wait.h> static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>"; |