diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-21 02:50:59 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 02:50:59 -0700 |
commit | 3bec0da08d6df03a103ddc4237cf2c79992c7dd4 (patch) | |
tree | c6b26993418a86b7c1eb72dcdff17489b5e410b1 /cache.h | |
parent | 48401221b349696357b35e02ff3e2c3d3c89d306 (diff) | |
parent | 583b7ea31b7c16f872b178d541591ab816d16f85 (diff) | |
download | git-3bec0da08d6df03a103ddc4237cf2c79992c7dd4.tar.gz git-3bec0da08d6df03a103ddc4237cf2c79992c7dd4.tar.xz |
Merge branch 'jc/upload-corrupt' into next
* jc/upload-corrupt:
upload-pack/fetch-pack: support side-band communication
Retire git-clone-pack
upload-pack: prepare for sideband message support.
upload-pack: avoid sending an incomplete pack upon failure
Fix possible out-of-bounds array access
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -374,8 +374,8 @@ extern char git_commit_encoding[MAX_ENCODING_LENGTH]; extern int copy_fd(int ifd, int ofd); /* Finish off pack transfer receiving end */ -extern int receive_unpack_pack(int fd[2], const char *me, int quiet); -extern int receive_keep_pack(int fd[2], const char *me, int quiet); +extern int receive_unpack_pack(int fd[2], const char *me, int quiet, int); +extern int receive_keep_pack(int fd[2], const char *me, int quiet, int); /* pager.c */ extern void setup_pager(void); |