diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-15 03:13:34 -0700 |
| commit | d7b6c3c0f54b951c85cd41c6e6571c65cf090111 (patch) | |
| tree | 44c009ddd29ab5a986dba9028d0b57a0b2e03201 /send-pack.c | |
| parent | 4c5cf8c44ce06a79da5bafd4a92e6d6f598cea2e (diff) | |
| parent | 3cd4f5e8eb04ae01298ceaf46bb41a4277031916 (diff) | |
| download | git-d7b6c3c0f54b951c85cd41c6e6571c65cf090111.tar.gz | |
Merge branch 'master' into pb/gitpm
* master: (166 commits)
git-apply --binary: clean up and prepare for --reverse
Fix detection of ipv6 on Solaris
Look for sockaddr_storage in sys/socket.h
Solaris has strlcpy() at least since version 8
git-apply --reverse: simplify reverse option.
t4116 apply --reverse test
Make sha1flush void and remove conditional return.
Make upload_pack void and remove conditional return.
Make track_tree_refs void.
Make pack_objects void.
Make fsck_dir void.
Make checkout_all void.
Make show_entry void
Make pprint_tag void and cleans up call in cmd_cat_file.
Remove combine-diff.c::uninteresting()
read-cache.c cleanup
http-push.c cleanup
diff.c cleanup
builtin-push.c cleanup
builtin-grep.c cleanup
...
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/send-pack.c b/send-pack.c index 10bc8bc359..b7cc1a9089 100644 --- a/send-pack.c +++ b/send-pack.c @@ -111,7 +111,7 @@ static void rev_list(int fd, struct ref *refs) exec_rev_list(refs); } -static int pack_objects(int fd, struct ref *refs) +static void pack_objects(int fd, struct ref *refs) { pid_t rev_list_pid; @@ -126,7 +126,6 @@ static int pack_objects(int fd, struct ref *refs) * We don't wait for the rev-list pipeline in the parent: * we end up waiting for the other end instead */ - return 0; } static void unmark_and_free(struct commit_list *list, unsigned int mark) |