From patchwork Thu Jun 6 10:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13688253 Received: from fhigh4-smtp.messagingengine.com (fhigh4-smtp.messagingengine.com [103.168.172.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5D4613E048 for ; Thu, 6 Jun 2024 10:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717669755; cv=none; b=ICTCB4vPVZKw9tlpq910LojxkOmWbSGblCXOrKp3J40Cp5Z+j4+Ws+iY0r6V7eDEUS+1XvhJFzIW8Qx1kM8gzRSLVmJYflm6//Sl/qbNpxMYrw9zft/5N+8SVTDrEa6gYT0LqqgQZtPlEnSt4SwDtCeXJLjgfWydE0uP7014tvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717669755; c=relaxed/simple; bh=M4ldNmLY6PkJYbGwqgCNRsRl6k8gm/4HOKyFLZoBDz8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=V5/hfDoH4xZ9ZQ60SNeJ4afHdonP1/+71WOBbGEzYMD4eUolt4L9RPq77zp581Ss3Vp2VfDRdoXHMxPNyRnMmf54cP2HnZEGqkJKMH+Fa+vIFT1cPd6qml6WpJs/GHiMkyGoPamj1Bl8B8y6uHKdL1gAFuYsUCQcJooZiKyQxPM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=NvoWCEQU; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=j4jtxkT3; arc=none smtp.client-ip=103.168.172.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="NvoWCEQU"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="j4jtxkT3" Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 3222B11401BD; Thu, 6 Jun 2024 06:29:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 06 Jun 2024 06:29:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1717669753; x=1717756153; bh=zfG1pMzR0F 50nsTP/MvU5oCKBgRX/3DYroHDT1v4PFI=; b=NvoWCEQUfyeevFOp2C8K1B3iVV s+OhE9CXks2QM+at9njkrA3o8pRCBi0yl9/IUOuklcDz8Ba/fpQjTm6xtEb2pBKP K1oJhLcuW1cwFeW5Ar7q1fPOY0k9tDVQtfK8JsxmpSBwGvAbbPZT2Yan6F8rHDfx X3dIQOQbiWKAH/EfUJJU0j979i86x6lVykKW5mcKg+IzPUvMTJ92iSB+aqRIlAqY 1hcdVHiHYLfX0aXkhVMA2/Cd3PZz9Ir4ZhAoKTbku/nqpb67lo7oNaftz/wPawd/ ME3laFh/RDKOXUiIGI+N2sdm1tlWtGTEYOtTRK/I2QXrLerVFMnoXbTic08A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1717669753; x=1717756153; bh=zfG1pMzR0F50nsTP/MvU5oCKBgRX /3DYroHDT1v4PFI=; b=j4jtxkT3lCCzIek2FW8FMRKn3R6lMLCCfLbOWZgh8AcU EGZbukFIHu2jevVpjhZtHA4hlQpgfEqdXoMBLV0cfAZaSuGn4MagHQEcDcqGjOso gPzHx+RJVJRs2qjT+TPzPylKI0bj4yCiJFyfzJAgK6UEHIrfZE4PiZOUQMAxJeNX 0E0ei/IfOdmWhKUGiFOsYLvwqUIoiRFziwbFOXT05mhX6EFggfudG+fegcMHDEUD pahp8o5+qjpmXPWatBYXhup6oPhkU5/qxMT9Cs4USWDE9cXqW2saUR5CKURdhuOh vUsZUp6Y1HhZudBEmKJd8XFUTSE+qDF9oUQjffQL5A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdelkedgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 6 Jun 2024 06:29:11 -0400 (EDT) Received: by localhost (OpenSMTPD) with ESMTPSA id fec83e34 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 6 Jun 2024 10:28:41 +0000 (UTC) Date: Thu, 6 Jun 2024 12:29:09 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Eric Sunshine Subject: [PATCH v5 18/27] send-pack: always allocate receive status Message-ID: <527755b64859a59753bb28ecdfe1e36e827fe5f6.1717667854.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: In `receive_status()`, we record the reason why ref updates have been rejected by the remote via the `remote_status`. But while we allocate the assigned string when a reason was given, we assign a string constant when no reason was given. This has been working fine so far due to two reasons: - We don't ever free the refs in git-send-pack(1)' - Remotes always give a reason, at least as implemented by Git proper. Adapt the code to always allocate the receive status string and free the refs. Signed-off-by: Patrick Steinhardt --- builtin/send-pack.c | 2 ++ send-pack.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 3df9eaad09..17cae6bbbd 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -336,5 +336,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) /* stable plumbing output; do not modify or localize */ fprintf(stderr, "Everything up-to-date\n"); + free_refs(remote_refs); + free_refs(local_refs); return ret; } diff --git a/send-pack.c b/send-pack.c index 37f59d4f66..88e96d000b 100644 --- a/send-pack.c +++ b/send-pack.c @@ -259,7 +259,7 @@ static int receive_status(struct packet_reader *reader, struct ref *refs) if (p) hint->remote_status = xstrdup(p); else - hint->remote_status = "failed"; + hint->remote_status = xstrdup("failed"); } else { hint->status = REF_STATUS_OK; hint->remote_status = xstrdup_or_null(p);