diff.h: make pickaxe_opts an unsigned bit field

diff --git a/send-pack.c b/send-pack.c
index 11d6f3d98398e8b7a1add501dd7ee85a736531b6..a8cc6b266e67847abafa613184752b3b781eb8dd 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -492,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;
                }