Skip to content

Commit

Permalink
Merge branch 'jc/push-cert'
Browse files Browse the repository at this point in the history
* jc/push-cert:
  receive-pack: avoid minor leak in case start_async() fails
  • Loading branch information
Junio C Hamano committed Oct 31, 2014
2 parents 598d7eb + 5d222c0 commit 1d42cf3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin/receive-pack.c
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 1d42cf3

Please sign in to comment.