From patchwork Wed Oct 23 15:36:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bence Ferdinandy X-Patchwork-Id: 13847314 Received: from aib29agh123.zrh1.oracleemaildelivery.com (aib29agh123.zrh1.oracleemaildelivery.com [192.29.178.123]) (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 75E1A1C9DE7 for ; Wed, 23 Oct 2024 15:39:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.29.178.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697943; cv=none; b=pBfZFs7+cj+JHB8XwWVBtjay1qCYwb3GTLPIR2hi/d9WsavlGgXkVNDxNdQqsXIeuYSaI5tu0jJlB0cwNG4iZADFnUJjEMoFWIrCEpUxSNoj+HfpVefBsDThsVrfCRqi2myZV+p1Zl/gmpD95qBEYKUyNqPw7tc2rXg3SvxKEok= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729697943; c=relaxed/simple; bh=oRN5l0enCe8T/vhnByW8CC9iBKvfRQNqTujx9XYZ6lo=; h=From:To:Cc:Subject:Date:Message-id:In-reply-to:References: MIME-version; b=bfXo53bVBi2Qkh79Ozj9iJ3GnCYqRsdRwE1pj7hrd2sZIymR4SIPSKArDnET0yDJbj31c8GRW1gKAhanhpG7pqw5TF4msBGExiNoftZ0kPz0M1PcqNrzwOE1Uyzp9WDSk4mHsSH8P3ypbUFlrZPP3qITBRa3juBnP/JfZxP55C4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=ferdinandy.com; spf=pass smtp.mailfrom=zrh1.rp.oracleemaildelivery.com; dkim=pass (2048-bit key) header.d=zrh1.rp.oracleemaildelivery.com header.i=@zrh1.rp.oracleemaildelivery.com header.b=XYfpoeHh; arc=none smtp.client-ip=192.29.178.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=ferdinandy.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zrh1.rp.oracleemaildelivery.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zrh1.rp.oracleemaildelivery.com header.i=@zrh1.rp.oracleemaildelivery.com header.b="XYfpoeHh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-zrh-20200406; d=zrh1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender:List-Unsubscribe:List-Unsubscribe-Post; bh=sUXyCkoW6I3xLlLbllzZsapBRrWwE1OtNFCZxLzpM4w=; b=XYfpoeHhRmL6SHhJNN5l09pTYh3zS7sEREcCTIsU3W5J/WM4FMutfcGSCt9W728qiur2EaGP9VFk WHfPyiAmdzhGc0K8dRzFrO/NcY9fHmAkysIY22OcvpNa72acWRuJ+ofIk2FFMnqzQvMq0t6uRWRB Xijwvzic2wl20WY06CG2jhFvvBpunfFfPKfi1qwOx6KhUZx2onpahEVQaDv8HBFI+fhdeSqrjs5Y vppdnACwlI/sklR42iT3Xs6d5GNTRfnbb9ViE+1sYettvuu9yHWnCL9T/EgmVEK2ngek3x7pizVn 2P+7ErKQuCt3qeey8Gp/1sTsZsQVOZ23WXFb4g== Received: by omta-ad1-fd1-402-eu-zurich-1.omtaad1.vcndpzrh.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20240911 64bit (built Sep 11 2024)) with ESMTPS id <0SLT00DSFFGZYL40@omta-ad1-fd1-402-eu-zurich-1.omtaad1.vcndpzrh.oraclevcn.com> for git@vger.kernel.org; Wed, 23 Oct 2024 15:38:59 +0000 (GMT) List-Unsubscribe-Post: List-Unsubscribe=One-Click From: Bence Ferdinandy To: git@vger.kernel.org Cc: phillip.wood@dunelm.org.uk, =?utf-8?q?Ren=C3=A9_Scharfe?= , Johannes Schindelin , Junio C Hamano , karthik.188@gmail.com, Taylor Blau , Bence Ferdinandy , ferdinandy.bence@ttk.elte.hu Subject: [PATCH v12 3/8] remote set-head: refactor for readability Date: Wed, 23 Oct 2024 17:36:37 +0200 Message-id: <20241023153736.257733-4-bence@ferdinandy.com> In-reply-to: <20241023153736.257733-1-bence@ferdinandy.com> References: <20241022194710.3743691-1-bence@ferdinandy.com> <20241023153736.257733-1-bence@ferdinandy.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-version: 1.0 Content-transfer-encoding: 8bit Reporting-Meta: AAE3E2yj7RcntEa9ZQAgXIrjzU4XcukpfUYogdhY4k8jpoCTBWTGODvDlIz70Xjn ssPa+a+P7IAcXylge90pbAyLXr6svSzJuZSy318sDR54wau85TUHWd8cld6pbee9 oWKLtS0Owqto1vphDjt7YnCA0DOiMIKO+gPRcwn0L8F2v0jA0CMrgnh/32d9EI6H d+DpM++MpinpyF5sfX3+Ww1i2jrldtO8XT/qa+5XcA2FL4Z5JFdT0u6PBjTJosZ3 W4C0DYJgTaYtWPo2wEsL33yXXDDbCFgmuT1os5zmMUtAVB7VjBoI/L7yPjUYjk2H YxjfCK1Pm22CR3J/cnUehWeNFF9ouyufZcYOf1AjyMOdupbEAG0ui8sq0MBvwrNL WS9fbbY6ZowuKZhKjK/fwOBPfKLOwNMsbbUjinRVLKIhcUIlZOy2XNkrJCzhXbZl yrpDTMFhSex/IcQm3Q+/N1Jhqv74YTLmBZ4yZH4kTE9sH9xJUMZzYV4= Rename buf and buf2 to something more explanatory. Instead of calling get_main_ref_store(the_repository) multiple times, call it once and store in a new refs variable. Although this change probably offers some performance benefits, the main purpose is to shorten the line lengths of function calls using this variable. Signed-off-by: Bence Ferdinandy --- Notes: v5: new patch (split from the next patch as a preparatory step) v6: no change v7: - change commit prefix to be more in line with project standards v8: no change v9: - further improve readability by renaming buf, and buf2 consistently with how patch 6 was already done v10: no change v11: no change v12: no change builtin/remote.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 76670ddd8b..1d68c5b2ba 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1402,8 +1402,9 @@ static int show(int argc, const char **argv, const char *prefix) static int set_head(int argc, const char **argv, const char *prefix) { int i, opt_a = 0, opt_d = 0, result = 0; - struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT; + struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT; char *head_name = NULL; + struct ref_store *refs = get_main_ref_store(the_repository); struct option options[] = { OPT_BOOL('a', "auto", &opt_a, @@ -1415,7 +1416,7 @@ static int set_head(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, builtin_remote_sethead_usage, 0); if (argc) - strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]); + strbuf_addf(&b_head, "refs/remotes/%s/HEAD", argv[0]); if (!opt_a && !opt_d && argc == 2) { head_name = xstrdup(argv[1]); @@ -1434,25 +1435,25 @@ static int set_head(int argc, const char **argv, const char *prefix) head_name = xstrdup(states.heads.items[0].string); free_remote_ref_states(&states); } else if (opt_d && !opt_a && argc == 1) { - if (refs_delete_ref(get_main_ref_store(the_repository), NULL, buf.buf, NULL, REF_NO_DEREF)) - result |= error(_("Could not delete %s"), buf.buf); + if (refs_delete_ref(refs, NULL, b_head.buf, NULL, REF_NO_DEREF)) + result |= error(_("Could not delete %s"), b_head.buf); } else usage_with_options(builtin_remote_sethead_usage, options); if (head_name) { - strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name); + strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", argv[0], head_name); /* make sure it's valid */ - if (!refs_ref_exists(get_main_ref_store(the_repository), buf2.buf)) - result |= error(_("Not a valid ref: %s"), buf2.buf); - else if (refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote set-head")) - result |= error(_("Could not setup %s"), buf.buf); + if (!refs_ref_exists(refs, b_remote_head.buf)) + result |= error(_("Not a valid ref: %s"), b_remote_head.buf); + else if (refs_update_symref(refs, b_head.buf, b_remote_head.buf, "remote set-head")) + result |= error(_("Could not setup %s"), b_head.buf); else if (opt_a) printf("%s/HEAD set to %s\n", argv[0], head_name); free(head_name); } - strbuf_release(&buf); - strbuf_release(&buf2); + strbuf_release(&b_head); + strbuf_release(&b_remote_head); return result; }