Merge branch 'jc/push-cert'

* jc/push-cert:
  receive-pack: avoid minor leak in case start_async() fails
This commit is contained in:
Junio C Hamano 2014-10-31 11:49:53 -07:00
commit 1d42cf3c6c

View File

@ -527,8 +527,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
proc.in = -1; proc.in = -1;
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;
prepare_push_cert_sha1(&proc);
if (use_sideband) { if (use_sideband) {
memset(&muxer, 0, sizeof(muxer)); memset(&muxer, 0, sizeof(muxer));
muxer.proc = copy_to_sideband; muxer.proc = copy_to_sideband;
@ -539,6 +537,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
proc.err = muxer.in; proc.err = muxer.in;
} }
prepare_push_cert_sha1(&proc);
code = start_command(&proc); code = start_command(&proc);
if (code) { if (code) {
if (use_sideband) if (use_sideband)