diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-31 11:49:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-31 11:49:55 -0700 |
| commit | 1d42cf3c6c578003f35d32cb7b98aa19a96a17c1 (patch) | |
| tree | 68d45a881be495f9a8084594015ddf31d50d3b68 | |
| parent | Merge branch 'rs/child-process-init' (diff) | |
| parent | receive-pack: avoid minor leak in case start_async() fails (diff) | |
| download | tgif-1d42cf3c6c578003f35d32cb7b98aa19a96a17c1.tar.xz | |
Merge branch 'jc/push-cert'
* jc/push-cert:
receive-pack: avoid minor leak in case start_async() fails
| -rw-r--r-- | builtin/receive-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index fc0393779c..32fc540ef3 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -527,8 +527,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta proc.in = -1; proc.stdout_to_stderr = 1; - prepare_push_cert_sha1(&proc); - if (use_sideband) { memset(&muxer, 0, sizeof(muxer)); 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; } + prepare_push_cert_sha1(&proc); + code = start_command(&proc); if (code) { if (use_sideband) |