From patchwork Tue Mar 18 22:50:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14021681 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 193F12080D2 for ; Tue, 18 Mar 2025 22:50:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338222; cv=none; b=DOyo4cDAhe64IU17L9uCKABGTae2VAOJ8bQDJr/kGR3XNaS/ksK99frNK9zETFp0egh3oNKHxkj5WMgvgYbogTbNAuZKjyQRbwxdoQKz7huKQVaQ0ww6DFq/YLedPqtysVlfc5u9eVOkhAOc00I+IGvIji8I6AIcXg1q98nPN20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338222; c=relaxed/simple; bh=lNE5XGZbIz2+zA8cBL8TSJmElQzrN09X/pBXOI/GG0w=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=dUYWoTKTtVuSLRULFrT1kplBnoPEUHyy6DhBnDlAaZ5suQxZ/mcHMzYVRd/vmLHERQCPs6iiwmtBuesJXu/U3NySBY9V/wM9fc/rbztKrPDFGnxPzhNApC7pAa49gxj5Un6SKTzk4zGaUrwQfDxEDrLN/lAjOJCAEm00cWLA3co= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=ZBK7/MFw; arc=none smtp.client-ip=209.85.160.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="ZBK7/MFw" Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-47691d82bfbso49561861cf.0 for ; Tue, 18 Mar 2025 15:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742338220; x=1742943020; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=o8sfQmFPwSKKwJMcleJdYOo70+FYdCRwGe7dY4FqCx0=; b=ZBK7/MFwZKOo81CiSmSdeqjxlX0Akrmft+Qc5Q86QPutdMgd5a6r91YgSs4/ld7/bW yaR55R7bcDxTZ55I3bPYWmki1q0bhNQRmg4rx2M5HBAPu2KrO6dYZw4u0jTLVjTB4Kpt L3/F0A+jY6NpgWFo8KzPRXvaW7851MtB7eo3XI77NrujwMn6G+JZFgzxJyHq6DqOGwTO ZmPyJ/6JJozNBVotuRmtQyhXvVnkB80EnTraL51eE5n7nVA+aDVF5PWreJ42KRNvb6dC Tqwzdqlthx9Z6dxW09ZPK6zzYzCfShTEgA0UAnf/+r7uCrv5dig99fgTbBtJAmZy741I VX5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742338220; x=1742943020; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=o8sfQmFPwSKKwJMcleJdYOo70+FYdCRwGe7dY4FqCx0=; b=qJmnCHr6DICARug8Vuz3GxjLuTCmdgM3i9jw2zHJR5DOHnd8ZOo+26e+/cata0nbg6 sqw2LUvGYRaufJ9/RnCi5sI3OYASnaCLPCxbM2++sm9Wv2gU6YCTQSb+e1755F3G5u2r dc62hhYaOcDmI5K5fR6Zw/UM1C7o4L8PSGFcSOlJvIAW/1Tjj/m5uyo3fFlMW/bZYv2E 1iMmvBmQVBpH5WyjztfeUM88SeYXQUjQseRYfYbfu+bx+G6Ns/DkeuTgFj7T0MXTH359 wdeEAVrR93T5fJZcPCQd6Uu2sFfgx6br6pPCy55d+8FbGVUMqQNufu13vBMfkUD28bIP l9Qg== X-Gm-Message-State: AOJu0YxGWiWI1852LwhH6He/gL2fGcrxdUXwHBQA3rnbAjYaX5LlDRCw rB46UYZUlskCYnH/SYoEAkaHfB5Fpd8i6bk4C73ARJZ64dOnkFAHOOF7J6x0nw0HyEfoghyKNal tQ6Q= X-Gm-Gg: ASbGncvaD2Dx4c1Z8uA9UnhCW7RdCDt1RDMQET2mZRzgcR5Bosm9/3PrZzdzmGgesAs +/KiQTR1i2sMWktSc6gFnWKXzqKc3ZWb/R8BIale27T6D+QAT2FWFO234vUT43M5toGmqagKMbd +2f26bJ6r+Qtq+VKnzv6Av6a6iTOuqYwSMujh9d9wddYFmzplYfoMpIJd/KWWPOg5+IUHy5RvBB z1RfZw5CgdPTNqFmKXy4/DH3v1m5z91a/nzHqaVW6sOiEDiXouh39loDueWM3j0p4bqMjwdyr05 /xNoteO92dN/O9jTcPY0+Mb1LQjTxgXLZuW4QEQsMe4LiSQjcAsvjNkZ6sIV9UfMXoKWmCbHSs2 D66nMYQpAiXj5nBjf X-Google-Smtp-Source: AGHT+IGGaFjZr8xA/dO8Cj7IWeIhFgt0mItukrxf43044U3sH3FmKsfFTXRPq9nhtFofusvnNaYABA== X-Received: by 2002:a05:622a:1e95:b0:476:af21:9d4b with SMTP id d75a77b69052e-4770841faedmr13371811cf.37.1742338219810; Tue, 18 Mar 2025 15:50:19 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-476bb824a8csm72222271cf.65.2025.03.18.15.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 15:50:19 -0700 (PDT) Date: Tue, 18 Mar 2025 18:50:18 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Igor Todorovski , Bence Ferdinandy Subject: [PATCH v2 1/4] refspec: treat 'fetch' as a Boolean value Message-ID: <04e1ab8209681f9090ff880fb4e0b452ff0d747a.1742338207.git.me@ttaylorr.com> 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: Since 6d4c057859 (refspec: introduce struct refspec, 2018-05-16), we have macros called REFSPEC_FETCH and REFSPEC_PUSH. This confusingly suggests that we might introduce other modes in the future, which, while possible, is highly unlikely. But these values are treated as a Boolean, and stored in a struct field called 'fetch'. So the following: if (refspec->fetch == REFSPEC_FETCH) { ... } , and if (refspec->fetch) { ... } are equivalent. Let's avoid renaming the Boolean values "true" and "false" here and remove the two REFSPEC_ macros mentioned above. Since this value is truly a Boolean and will only ever take on a value of 0 or 1, we can declare it as a single bit unsigned field. In practice this won't shrink the size of 'struct refspec', but it more clearly indicates the intent. Note that this introduces some awkwardness like: refspec_item_init_or_die(&spec, refspec, 1); , where it's unclear what the final "1" does. This will be addressed in the following commits. Signed-off-by: Taylor Blau --- builtin/pull.c | 2 +- refspec.c | 4 ++-- refspec.h | 9 +++------ remote.c | 4 ++-- transport-helper.c | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 9c4a00620a..8bbfcce729 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -738,7 +738,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec) const char *spec_src; const char *merge_branch; - refspec_item_init_or_die(&spec, refspec, REFSPEC_FETCH); + refspec_item_init_or_die(&spec, refspec, 1); spec_src = spec.src; if (!*spec_src || !strcmp(spec_src, "HEAD")) spec_src = "HEAD"; diff --git a/refspec.c b/refspec.c index c6ad515f04..db5a1c34a5 100644 --- a/refspec.c +++ b/refspec.c @@ -233,7 +233,7 @@ void refspec_clear(struct refspec *rs) int valid_fetch_refspec(const char *fetch_refspec_str) { struct refspec_item refspec; - int ret = refspec_item_init(&refspec, fetch_refspec_str, REFSPEC_FETCH); + int ret = refspec_item_init(&refspec, fetch_refspec_str, 1); refspec_item_clear(&refspec); return ret; } @@ -249,7 +249,7 @@ void refspec_ref_prefixes(const struct refspec *rs, if (item->negative) continue; - if (rs->fetch == REFSPEC_FETCH) { + if (rs->fetch) { if (item->exact_sha1) continue; prefix = item->src; diff --git a/refspec.h b/refspec.h index e2b5cc54ef..155494cd3a 100644 --- a/refspec.h +++ b/refspec.h @@ -32,11 +32,8 @@ struct refspec_item { struct string_list; -#define REFSPEC_FETCH 1 -#define REFSPEC_PUSH 0 - -#define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH } -#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH } +#define REFSPEC_INIT_FETCH { .fetch = 1 } +#define REFSPEC_INIT_PUSH { .fetch = 0 } /** * An array of strings can be parsed into a struct refspec using @@ -47,7 +44,7 @@ struct refspec { int alloc; int nr; - int fetch; + unsigned fetch : 1; }; int refspec_item_init(struct refspec_item *item, const char *refspec, diff --git a/remote.c b/remote.c index e609cf5c56..addd4a9999 100644 --- a/remote.c +++ b/remote.c @@ -143,8 +143,8 @@ static struct remote *make_remote(struct remote_state *remote_state, ret->prune = -1; /* unspecified */ ret->prune_tags = -1; /* unspecified */ ret->name = xstrndup(name, len); - refspec_init(&ret->push, REFSPEC_PUSH); - refspec_init(&ret->fetch, REFSPEC_FETCH); + refspec_init(&ret->push, 0); + refspec_init(&ret->fetch, 1); string_list_init_dup(&ret->server_options); ALLOC_GROW(remote_state->remotes, remote_state->remotes_nr + 1, diff --git a/transport-helper.c b/transport-helper.c index d457b42550..43cd760119 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -162,7 +162,7 @@ static struct child_process *get_helper(struct transport *transport) data->helper = helper; data->no_disconnect_req = 0; - refspec_init(&data->rs, REFSPEC_FETCH); + refspec_init(&data->rs, 1); /* * Open the output as FILE* so strbuf_getline_*() family of From patchwork Tue Mar 18 22:50:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14021682 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47DAB2080D2 for ; Tue, 18 Mar 2025 22:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338225; cv=none; b=asytLHtUGKkTUy8tOGC8rAtgh6H1n626MomDsi6EbEP7j2JwoIRw9pJ3JU1Dg5tbS4N6IyVAoywIt1TELSj0vuYnSJDKHr1igb6OZ71S10y2NFydI3VQozqUtbi/8uzcETrWJpW7/+3QY19Bw2woHjMwXOIXE9RifknGg5GEdkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338225; c=relaxed/simple; bh=mW7UHbpZM+uzoC30EMllGFnHA8TO5E6WIu8PmX4w6io=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=gTMiMpnBk1I1TFG53Opm80MzY5xpKNMLRfrhOSgUFq+jhJPClBd/7Q1NS/+o/k79mcHCDKI9PYWjN1yWs7J7bmV1kAttx8Jt6VaBR7Uj642bPkmoJPwbFXbrqlGOD1FalT1AD2AlFSSqmUrg6I6chVwmkSwGYrnUa3E/xLYcJ1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=uHHP7ufR; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="uHHP7ufR" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7be6fdeee35so1083062385a.1 for ; Tue, 18 Mar 2025 15:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742338223; x=1742943023; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=F3csdj2t6BBKxjSbaSbomj2BGwvdrzVKeX7lHgL6lm0=; b=uHHP7ufRBwjq1Pjzc84/GTgJLw9b5u0pk9rLY/t+VCO1Nnh27ABFKomw8cDSrhhM5K 0IQIddWapZ6Ao2IUnH/9NR9NcU7917iHlbODGng2401n9+jcz+aEnnM1iuAp8G2bpgUP LtZW8jrksOgFND0ndVx+cRs+U7NYJW4WLBJcjrItMfN4C/1uMwkk+71x0Krv0A1GmL1v slQy4qmy4Dw87vlijda+S4LluYfG1B309kiJXeZzus8iZSuZZtMEue4YdrCvFFaM8Lt5 lchI5akHo/9/+ABjqMSuoEEhhCNAh29Y+L6rg5OvXT3znXhTSeuvHTBzQ+e+/TUJ9Dn9 W6AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742338223; x=1742943023; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=F3csdj2t6BBKxjSbaSbomj2BGwvdrzVKeX7lHgL6lm0=; b=GU3oKO1JgvuGZRjXsNxIKQcQCPWZ//tkkGFu9mE3bVKHTiU0v3QHnY8J64Cla3nRCy SkG9DAX8Y+Uc5eLLrSl+QrEdSnN1I4JtFhQKKpkORFsUcYbKLKKyejM9ftd9kivWg71q uL2brykpACmjP8tkcYODOVisg80nVEsyVFIYR6dzjSfS0Cgb5aekE9Pc9lf6LtLgZ3WU mPwgSLx5zwu1p7vTDU5o/If5SsjIaN0oBquGPcp5RP5+fiJeF5c5HHiO1cWqHPjQ3EMq iViUcZ6/8SKt1u0lU+N7VWil4w2G0QQ/pVaKaj3ynHF6OsURDgTiSuAZNKhEFyekySXc CGCQ== X-Gm-Message-State: AOJu0YyOkmvhBnV+qVibmg84RdL+qTdmwgK6T6LlkxJaTR0lGTfM2Qfd j71km/x7K8sZGxT/jhKm55S21VNFLjuRmVOGMzh2OtZ6sRooL9u3p4jFuuzcPyDlSI6jSvAajqu 4IRc= X-Gm-Gg: ASbGnctjS49PRQ5kuzWbjyjReENxWa/6oS2E1krlZXPN7zU+2KPTVqLmbyQ/3CBw/E0 DBJsUdy+M3M0fuEELNTCa0XleIj0RYnHV4fGoj1sG6xsIBlLWIlvlauk8TAe88dJ6Akc5tu6XZl 5Dy8v2IUkktkuBmm6r+b0Zi3jiayi5U0gb+emvesGbBYkmRn/TWLLMTJa/LbeUokOUb/Y3MFjTX AlMGvusadf7+/C9lwcq4WBpneoChQQwTyN4Zf/rfB5q7diC6P3n+YMxNNCBBV2VbSGj9gxKnaDt /zcbGQVJC1T7LiNrLrGCYWCfVglT684b4SYrx7UZaDU6llwqMWIjKEJ8gaXn/NmmisU94dqNypL spe2VFRwbyXxZ9Z3K X-Google-Smtp-Source: AGHT+IG5h60fkb2XCv4TRR6t6PXCWiD8o8/BWP0A4G8p4cQHk/ky/FnlmmnGs8WjNtc5xh5LKzCXAw== X-Received: by 2002:a05:620a:1a8f:b0:7c5:4dc4:ae48 with SMTP id af79cd13be357-7c5a846018emr58883385a.39.1742338223071; Tue, 18 Mar 2025 15:50:23 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-7c573c4f531sm773197785a.19.2025.03.18.15.50.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 15:50:22 -0700 (PDT) Date: Tue, 18 Mar 2025 18:50:21 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Igor Todorovski , Bence Ferdinandy Subject: [PATCH v2 2/4] refspec: replace `refspec_init()` with fetch/push variants Message-ID: 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: To avoid having a Boolean argument in the refspec_init() function, replace it with two variants: - `refspec_init_fetch()` - `refspec_init_push()` to codify the meaning of that Boolean into the function's name itself. Signed-off-by: Taylor Blau --- refspec.c | 12 +++++++++--- refspec.h | 3 ++- remote.c | 4 ++-- transport-helper.c | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/refspec.c b/refspec.c index db5a1c34a5..f6be0c54d7 100644 --- a/refspec.c +++ b/refspec.c @@ -178,10 +178,16 @@ void refspec_item_clear(struct refspec_item *item) item->exact_sha1 = 0; } -void refspec_init(struct refspec *rs, int fetch) +void refspec_init_fetch(struct refspec *rs) { - memset(rs, 0, sizeof(*rs)); - rs->fetch = fetch; + struct refspec blank = REFSPEC_INIT_FETCH; + memcpy(rs, &blank, sizeof(*rs)); +} + +void refspec_init_push(struct refspec *rs) +{ + struct refspec blank = REFSPEC_INIT_PUSH; + memcpy(rs, &blank, sizeof(*rs)); } void refspec_append(struct refspec *rs, const char *refspec) diff --git a/refspec.h b/refspec.h index 155494cd3a..7db68e56c8 100644 --- a/refspec.h +++ b/refspec.h @@ -52,7 +52,8 @@ int refspec_item_init(struct refspec_item *item, const char *refspec, void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, int fetch); void refspec_item_clear(struct refspec_item *item); -void refspec_init(struct refspec *rs, int fetch); +void refspec_init_fetch(struct refspec *rs); +void refspec_init_push(struct refspec *rs); void refspec_append(struct refspec *rs, const char *refspec); __attribute__((format (printf,2,3))) void refspec_appendf(struct refspec *rs, const char *fmt, ...); diff --git a/remote.c b/remote.c index addd4a9999..25af97a44b 100644 --- a/remote.c +++ b/remote.c @@ -143,8 +143,8 @@ static struct remote *make_remote(struct remote_state *remote_state, ret->prune = -1; /* unspecified */ ret->prune_tags = -1; /* unspecified */ ret->name = xstrndup(name, len); - refspec_init(&ret->push, 0); - refspec_init(&ret->fetch, 1); + refspec_init_push(&ret->push); + refspec_init_fetch(&ret->fetch); string_list_init_dup(&ret->server_options); ALLOC_GROW(remote_state->remotes, remote_state->remotes_nr + 1, diff --git a/transport-helper.c b/transport-helper.c index 43cd760119..69391ee7d2 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -162,7 +162,7 @@ static struct child_process *get_helper(struct transport *transport) data->helper = helper; data->no_disconnect_req = 0; - refspec_init(&data->rs, 1); + refspec_init_fetch(&data->rs); /* * Open the output as FILE* so strbuf_getline_*() family of From patchwork Tue Mar 18 22:50:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14021683 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9100213256 for ; Tue, 18 Mar 2025 22:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338229; cv=none; b=mBrNLdzkYyynW5oRLUb83d0j5Cq19tYuxVtlAOZxfaiTd73F7O9hM/Y85RvtnT9d2ZARF3aZLh09OzNk+Ogw3Mt8Qzf1RjRA91GjsnaT5vVHYJtNM1oWwUrD95fYH3g6D/O4GxAjGknHNd/F+2cZFaH6fVzuN4vrErdnwJxlNvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338229; c=relaxed/simple; bh=u/FDWV1ATaGJbinMX5oZE8F6K3dtLCjFyK89BoRATrE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=u95+/oy1VPeawLVn9UuI4sM0/EYrNmI9u0p6UqCnSiGo/Ojof1kxvXCPWrSz/ApVUAalMfRjoVSNDF5OiNogWb+DmHnU8vdHXm07oq+ljtQZFRNAJ09TYz2t6J9Kqb8wfr6Ih6NVxXGvSBYvjyxU9ZM5fsVFPsTSA8aswTY2+d4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=tBB926r6; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="tBB926r6" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-4769aef457bso68665261cf.2 for ; Tue, 18 Mar 2025 15:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742338226; x=1742943026; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RFTHJhzilEZAsOZPOf70z3Emb1Q3HN4MyzCABuGUC28=; b=tBB926r6gkT2jQwdoafayq+Zqm1YOKkwPXHCVBiviS6WpnrhltAxvcUnFmt6bcCF0p 8fNkqc5x2VVLnPI0i0SbyChJACvjk6+kRVwtZR3Au/VEfrAgkCJ8kMkRkblLQk8k7/8f i0JHRRrxvXemYb/S1N4rsSwkLU74YdjpD6gyyIpAn1RZDYbx9WqA4dODWg+tFLkg58Dc y9V/Gh4vYHXEdexkqRdsbxDTTzuYyvovM+IwpSXOJBoOveoa1qcFjIHFP7gr7UiWXeCK Mj5Wn5yoYKH3LC2Kx+n+1hVm18TpmvpBfBynq9AVTe0e/LQKJ4+P18u/LuAPFoduQgWk gybw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742338226; x=1742943026; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RFTHJhzilEZAsOZPOf70z3Emb1Q3HN4MyzCABuGUC28=; b=hdR/+x2rwFDsIu+1a6g5WHeHSN42Z5hG2Nve8jlBryiNyDqIrtErO1pQujf00aQ9jR 5Oy5Lc8dS4petW8Ikrjp3M70UFleka8vxtkjrXdEI5iySJQKD8A1+uX3DniWJmyjrN3Y gwFXodTmEiEvzJpT0yacimCFlxen0UTk1UwbOmFUweQZRTk2GzZarlW3NvNxIWRGT+3j L4TYlGXnAbLqf8tjhoaahBgv1byZ+5UEY5hwydQx+G/D2GyO03pSxx0u3NJfbGBIwKRo D0lDOE6rtIAnzmV68pTlShmgNXM5otNYXj1HtJ6RarLs7D5tGhaW3AYxJDNgyN57iqoQ 1TJw== X-Gm-Message-State: AOJu0YzfTiqgn5YutP/BPFx3NwZaRbyQirew3fOymK5qJiTujWcJB7Tm 3chGNyc/RrTP/t/lUIXhBq8dB0ynB5kwlANpoMJMUNywYaPTXg9AV5Ya1IvN5jiwchDYdeURtYu koD8= X-Gm-Gg: ASbGncuTiQOIrYeKPyF0uq/zvlj5kq2CDDJldh/aELEHNruCCVONqB1aIeYYyYY6o5e w+q+XxA3i9fiAYA2PPRTktYsSB/SSjzA+YLv7Tcu+tib8Jx3k0DpjCYafqg3VP3HJvxHyr86qeU 0n/yDbuVDayM53UA+jSly1dSLuQHI21F4hYxGwMFW2WsToTneZrKEtb3A9PF+D1F5xrc0g54kt0 Xme/F40lEK50oHeZi9kcHrR8t00opri4gkBjq7UmhFro92hOokMB2SAhcb+kI36CxsqNw4/2wtV EHSGEnENe5CLGgUhENEBTo6a52BP3B3/wb5vU0mmhBAxbw0MCuKhqzF1uOp/leFwHyxfCZ5ji0c UzNpskryAZ/ogjQzU X-Google-Smtp-Source: AGHT+IHpoctWCUmw4JkPN8Qp4Qeu8RPRyNxtwxSxdw5/N5PghHlzWy2Icp+n3bl4NXl+2xyj1Hsrvw== X-Received: by 2002:a05:622a:a08:b0:476:b591:1f19 with SMTP id d75a77b69052e-477082923b8mr9823011cf.7.1742338226228; Tue, 18 Mar 2025 15:50:26 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-476bb7f21d9sm73996991cf.49.2025.03.18.15.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 15:50:26 -0700 (PDT) Date: Tue, 18 Mar 2025 18:50:24 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Igor Todorovski , Bence Ferdinandy Subject: [PATCH v2 3/4] refspec: remove refspec_item_init_or_die() Message-ID: <88f6a91c468f38669d958c58b2e2eefa9f448010.1742338207.git.me@ttaylorr.com> 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: There are two callers of this function, which ensures that a dispatched call to refspec_item_init() does not fail. In the following commit, we're going to add fetch/push-specific variants of refspec_item_init(), which will turn one function into two. To avoid introducing yet another pair of new functions (such as refspec_item_init_push_or_die() and refspec_item_init_fetch_or_die()), let's remove the thin wrapper entirely. This duplicates a single line of code among two callers, but thins the refspec.h API by one function, and prevents introducing two more in the following commit. Note that we still have a trailing Boolean argument in the function `refspec_item_init()`. The following commit will address this. Signed-off-by: Taylor Blau --- builtin/pull.c | 3 ++- refspec.c | 10 ++-------- refspec.h | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 8bbfcce729..a68a9955de 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -738,7 +738,8 @@ static const char *get_tracking_branch(const char *remote, const char *refspec) const char *spec_src; const char *merge_branch; - refspec_item_init_or_die(&spec, refspec, 1); + if (!refspec_item_init(&spec, refspec, 1)) + die(_("invalid refspec '%s'"), refspec); spec_src = spec.src; if (!*spec_src || !strcmp(spec_src, "HEAD")) spec_src = "HEAD"; diff --git a/refspec.c b/refspec.c index f6be0c54d7..3aeb697505 100644 --- a/refspec.c +++ b/refspec.c @@ -160,13 +160,6 @@ int refspec_item_init(struct refspec_item *item, const char *refspec, int fetch) return parse_refspec(item, refspec, fetch); } -void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, - int fetch) -{ - if (!refspec_item_init(item, refspec, fetch)) - die(_("invalid refspec '%s'"), refspec); -} - void refspec_item_clear(struct refspec_item *item) { FREE_AND_NULL(item->src); @@ -194,7 +187,8 @@ void refspec_append(struct refspec *rs, const char *refspec) { struct refspec_item item; - refspec_item_init_or_die(&item, refspec, rs->fetch); + if (!refspec_item_init(&item, refspec, rs->fetch)) + die(_("invalid refspec '%s'"), refspec); ALLOC_GROW(rs->items, rs->nr + 1, rs->alloc); rs->items[rs->nr] = item; diff --git a/refspec.h b/refspec.h index 7db68e56c8..614f34554e 100644 --- a/refspec.h +++ b/refspec.h @@ -49,8 +49,6 @@ struct refspec { int refspec_item_init(struct refspec_item *item, const char *refspec, int fetch); -void refspec_item_init_or_die(struct refspec_item *item, const char *refspec, - int fetch); void refspec_item_clear(struct refspec_item *item); void refspec_init_fetch(struct refspec *rs); void refspec_init_push(struct refspec *rs); From patchwork Tue Mar 18 22:50:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Blau X-Patchwork-Id: 14021684 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 777A62080CD for ; Tue, 18 Mar 2025 22:50:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338232; cv=none; b=tEsWJ/M6mmGTCK0vUTXoSuo7fTaDPBKlaX36WQ0jK7xVHjyCWF6awG0JzXt/ZuX8teaxUYuQ3xHtHy87heUdICG65pz0GfUmjWHrvaPJBp9e1bF3wwRam14eFys1p0KRnyBC91aTnsW6dR/As4xZYiLqwbMQXwEcSW0GHBZHhZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742338232; c=relaxed/simple; bh=m+UwxlM80VSozkaZ+qSkMlCOQqWhms2nVbX69ik+bLo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=N1Jnr5ndi4fxkbRlzt7IgmiWj2XeeQI+cILm51jQxYedPROQAfOqPyQJySBaef2Z6AF72NpkIL3kEKdmnAAoxnrYsPSweh/660YAZAi/BNqf0kePNE3hY+L9VaGNC+2AFKjlSCtCk+0v4oSLZ2P8zpkrKayYCrIdA/sEekEul00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=pass smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=TANB+a7c; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="TANB+a7c" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7c0e135e953so618998785a.2 for ; Tue, 18 Mar 2025 15:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1742338229; x=1742943029; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9WPnQ6JK8ZckS8BN9r991kDn+vKg9ieiumh/+GF1/R8=; b=TANB+a7clYOy4728vtgmjOw1gFc33r4KLHcLMl2njSXuVgZUbeDXF/LKSMR8C1wPbM HUJHj0lYMcRAhnWUvVYQG5sxzIDQW4+GsRUgENFzSZyb29G4+cWfT6z+yFukfKvwfBEb HWLTRhCDqf9YQSu89cIdlDtiEnIQFeTcabDU0tR+LBxry0TvUhe1hZ/MpgBFlZ+VZh/t 0aPiMazZDT1rJTJuhltglz4PPGHKpaudyrwVojUYehddZ+aeBgda9VL3dPcm2mEeB1eW dY/qixysEQ7oTyaAg8rZeeeH7kSdebAPUGbh4RFXvX5zHJmmV/Lq4DeoDNkHYM3JRjbO uf2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742338229; x=1742943029; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9WPnQ6JK8ZckS8BN9r991kDn+vKg9ieiumh/+GF1/R8=; b=OExIM7E+LpvYKlCQbxigUYAMhJTqjvzhDBZdt9JirdVlYOu1fOqd2clnwQXc1sD7XN zSztgLQuCEhE2ewkahCLI5tl37Mq+sJp1YIMwanYr6I4ueGAtyWYgW/iLkRG3T/DE4Qd PnlCTN6KvAJ1peQhJCTEsdnHmkl4pGtcHAxEFiieA4CWi6lQavA39Vmmeg3QHOn0XATS Q9jEA2TLPUjZb5VQRTY70NgLAzsa7d/pXICIvoKyACj26jxIo3U+EsbENr0v3uV4/DbZ k//4qwNbODGwO0tU4Xa64H3cFkI9x5lBHQogVb0OP8V4JT9vXEW34CGic1QE/zvHBrmU iTWQ== X-Gm-Message-State: AOJu0YyoM1FQ/HbeTs6voSgetslXwY2TMdXxMCdj5ku2NAs6bUl7TOHw yeeqIlPukqv2hISL6nXWFDSg5t/zxhWuBoPOtPwZ+4SUO/lNOJ/aCSLNw1ue3Q8MjqHqblFAkxC oTOg= X-Gm-Gg: ASbGncvMTHq+8TxhElDsUG2weoLinGY6tAa5m/ngomTgYAgm30Vcak0QFcNvMejP5Sg F0ls8PUo7sI5P/5THjXznof4Obx41nYakUrXpHM4G74MpmBsCm2KjT7Op/8idO/DCGnWqjeBfOh wsosoX1v9pEaCPPiFaJI48vKj15QyBCfkd6w8GSeMcqeftmY5PoYetZF+yQ3Eo+3Zwivk5fHrZR SWGLEDXljLhgdMVe65DCHYyYZG6CUKsGiQNV9RlW/fWKTy2QBiVf9l7edYe73yMf7Nvhjdq+1ez QJnGb2Vbcx2gOrxl3uN2ueTZZ7eiE06u0VCEaK1Oa0NIffUXP7GjoenZFMV/TcyLY5tIxsyCXUy GPaI5Ol/Wc28Dl5fo X-Google-Smtp-Source: AGHT+IGgGKqX0M7X0A4I9aPkkcTG/Vy2WI5c3pv3LhtJoxq76C8eeo7Z2JpXvZuQ8KGuMG6MCaggmA== X-Received: by 2002:a05:622a:1f95:b0:476:8d14:6e7 with SMTP id d75a77b69052e-47708378a0bmr13457691cf.33.1742338229206; Tue, 18 Mar 2025 15:50:29 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-476bb7f3c86sm72077021cf.54.2025.03.18.15.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 15:50:28 -0700 (PDT) Date: Tue, 18 Mar 2025 18:50:27 -0400 From: Taylor Blau To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Igor Todorovski , Bence Ferdinandy Subject: [PATCH v2 4/4] refspec: replace `refspec_item_init()` with fetch/push variants Message-ID: 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: For similar reasons as in the previous refactoring of `refspec_init()` into `refspec_init_fetch()` and `refspec_init_push()`, apply the same refactoring to `refspec_item_init()`. Signed-off-by: Taylor Blau --- builtin/fetch.c | 2 +- builtin/pull.c | 2 +- refspec.c | 22 +++++++++++++++++++--- refspec.h | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 02af505469..9830c09011 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -586,7 +586,7 @@ static struct ref *get_ref_map(struct remote *remote, struct refspec_item tag_refspec; /* also fetch all tags */ - refspec_item_init(&tag_refspec, TAG_REFSPEC, 0); + refspec_item_init_push(&tag_refspec, TAG_REFSPEC); get_fetch_map(remote_refs, &tag_refspec, &tail, 0); refspec_item_clear(&tag_refspec); } else if (tags == TAGS_DEFAULT && *autotags) { diff --git a/builtin/pull.c b/builtin/pull.c index a68a9955de..a1ebc6ad33 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -738,7 +738,7 @@ static const char *get_tracking_branch(const char *remote, const char *refspec) const char *spec_src; const char *merge_branch; - if (!refspec_item_init(&spec, refspec, 1)) + if (!refspec_item_init_fetch(&spec, refspec)) die(_("invalid refspec '%s'"), refspec); spec_src = spec.src; if (!*spec_src || !strcmp(spec_src, "HEAD")) diff --git a/refspec.c b/refspec.c index 3aeb697505..0775358d96 100644 --- a/refspec.c +++ b/refspec.c @@ -153,13 +153,24 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet return 1; } -int refspec_item_init(struct refspec_item *item, const char *refspec, int fetch) +static int refspec_item_init(struct refspec_item *item, const char *refspec, + int fetch) { memset(item, 0, sizeof(*item)); item->raw = xstrdup(refspec); return parse_refspec(item, refspec, fetch); } +int refspec_item_init_fetch(struct refspec_item *item, const char *refspec) +{ + return refspec_item_init(item, refspec, 1); +} + +int refspec_item_init_push(struct refspec_item *item, const char *refspec) +{ + return refspec_item_init(item, refspec, 0); +} + void refspec_item_clear(struct refspec_item *item) { FREE_AND_NULL(item->src); @@ -186,8 +197,13 @@ void refspec_init_push(struct refspec *rs) void refspec_append(struct refspec *rs, const char *refspec) { struct refspec_item item; + int ret; - if (!refspec_item_init(&item, refspec, rs->fetch)) + if (rs->fetch) + ret = refspec_item_init_fetch(&item, refspec); + else + ret = refspec_item_init_push(&item, refspec); + if (!ret) die(_("invalid refspec '%s'"), refspec); ALLOC_GROW(rs->items, rs->nr + 1, rs->alloc); @@ -233,7 +249,7 @@ void refspec_clear(struct refspec *rs) int valid_fetch_refspec(const char *fetch_refspec_str) { struct refspec_item refspec; - int ret = refspec_item_init(&refspec, fetch_refspec_str, 1); + int ret = refspec_item_init_fetch(&refspec, fetch_refspec_str); refspec_item_clear(&refspec); return ret; } diff --git a/refspec.h b/refspec.h index 614f34554e..8b04f9995e 100644 --- a/refspec.h +++ b/refspec.h @@ -47,8 +47,8 @@ struct refspec { unsigned fetch : 1; }; -int refspec_item_init(struct refspec_item *item, const char *refspec, - int fetch); +int refspec_item_init_fetch(struct refspec_item *item, const char *refspec); +int refspec_item_init_push(struct refspec_item *item, const char *refspec); void refspec_item_clear(struct refspec_item *item); void refspec_init_fetch(struct refspec *rs); void refspec_init_push(struct refspec *rs);