From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Sep 2024 21:03:30 +0000 (-0700)
Subject: Merge branch 'ps/leakfixes-part-6' into ps/leakfixes-part-7
X-Git-Tag: v2.47.0-rc1~3^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2b7f03e65ca8c0a5b6d1cbc42866db3df96aeed;p=thirdparty%2Fgit.git

Merge branch 'ps/leakfixes-part-6' into ps/leakfixes-part-7

* ps/leakfixes-part-6: (22 commits)
  builtin/repack: fix leaking keep-pack list
  merge-ort: fix two leaks when handling directory rename modifications
  match-trees: fix leaking prefixes in `shift_tree()`
  builtin/fmt-merge-msg: fix leaking buffers
  builtin/grep: fix leaking object context
  builtin/pack-objects: plug leaking list of keep-packs
  builtin/repack: fix leaking line buffer when packing promisors
  negotiator/skipping: fix leaking commit entries
  shallow: fix leaking members of `struct shallow_info`
  shallow: free grafts when unregistering them
  object: clear grafts when clearing parsed object pool
  gpg-interface: fix misdesigned signing key interfaces
  send-pack: fix leaking push cert nonce
  remote: fix leak in reachability check of a remote-tracking ref
  remote: fix leaking tracking refs
  builtin/submodule--helper: fix leaking refs on push-check
  submodule: fix leaking fetch task data
  upload-pack: fix leaking child process data on reachability checks
  builtin/push: fix leaking refspec query result
  send-pack: fix leaking common object IDs
  ...
---

a2b7f03e65ca8c0a5b6d1cbc42866db3df96aeed
diff --cc send-pack.c
index 5d0c23772a,31a62e6a98..6677c44e8a
--- a/send-pack.c
+++ b/send-pack.c
@@@ -623,12 -619,11 +627,11 @@@ int send_pack(struct send_pack_args *ar
  			 * atomically, abort the whole operation.
  			 */
  			if (use_atomic) {
- 				strbuf_release(&req_buf);
- 				strbuf_release(&cap_buf);
  				reject_atomic_push(remote_refs, args->send_mirror);
 -				error("atomic push failed for ref %s. status: %d\n",
 +				error("atomic push failed for ref %s. status: %d",
  				      ref->name, ref->status);
- 				return args->porcelain ? 0 : -1;
+ 				ret = args->porcelain ? 0 : -1;
+ 				goto out;
  			}
  			/* else fallthrough */
  		default: