diff options
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/send-pack.c b/send-pack.c index 78bb34ebec..a8cc6b266e 100644 --- a/send-pack.c +++ b/send-pack.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "config.h" #include "commit.h" #include "refs.h" #include "pkt-line.h" @@ -132,7 +133,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc * For a normal non-zero exit, we assume pack-objects wrote * something useful to stderr. For death by signal, though, * we should mention it to the user. The exception is SIGPIPE - * (141), because that's a normal occurence if the remote end + * (141), because that's a normal occurrence if the remote end * hangs up (and we'll report that by trying to read the unpack * status). */ @@ -491,9 +492,12 @@ int send_pack(struct send_pack_args *args, * we were to send it and we're trying to send the refs * atomically, abort the whole operation. */ - if (use_atomic) + if (use_atomic) { + strbuf_release(&req_buf); + strbuf_release(&cap_buf); return atomic_push_failure(args, remote_refs, ref); - /* Fallthrough for non atomic case. */ + } + /* else fallthrough */ default: continue; } |