From patchwork Tue Mar 18 11:58:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020857 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 6065E207E12 for ; Tue, 18 Mar 2025 11:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299163; cv=none; b=DTY+GLrjsEPjWb2IXuZr+B+b5MkgqrpxwKu8LLXHXKiPeB+4VNgEqjoBj0umQc/GITX+2/NOvrZi2x/dzlaNejenjxZ1G3g5iSjRXSvbNk9SiLmSrgXBMlt+vRYgUdYvH9jTPuxTivWzYuuoa4ZhXLUYOReIGhRpyTLRP9m6dZI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299163; c=relaxed/simple; bh=woOoairnn3V7YUBFIsN9goJ7MaLPKg/0DbHSrav+ITw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GKOtuDRzwVOtsCaQmzpQrmHKFl/AOjWH9sLQlCnDrWNDdIGfQz17bhCJb6o6RlEp5WT6YR+92ZHMHRJSMahrlYgXXIpnAbX/Op1WCGici8knxt4IeMxshrPYiNfbEYrNDWUz5VvQWNkh1jeogl1k5G7LgE34yMDw8Dwg+XUl4mc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XhwbTUxf; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XhwbTUxf" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-225e3002dffso56898845ad.1 for ; Tue, 18 Mar 2025 04:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299161; x=1742903961; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5qsH/l+jtisR3hlPMI2mnPlbMuso0oQLu6ZqtpCkH5E=; b=XhwbTUxfpgHpjPzMwwx8iCw/gW6qt/5naszPpcu7CLhL/3dGbYJ9FFqrhgKs058Jpm ++G56K9Wc8xBimapnNNcMIzaZrzUgfcRKvQpkIA56GE01HdCyS2hkW5z0XmrDODOJmSG KlYFq0l868oC03X6HlZQW47OMx4pJlFykWV0GQ31YcrRNeZ02iLVAZal23ZqX1j5lSe3 W2U2OZfaaKld/pWtfnB8+fFzcbYcMN+tR5By1KsYmdv8wzBGIpj+oL6UBiMxwQYG+1f8 P9zwPCvrmIjb+3sM9W7ZTzXbDgb4ap4hePzt6ndB73N9wGowmSj9hlvNN12XleWZbB2q kk6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299161; x=1742903961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5qsH/l+jtisR3hlPMI2mnPlbMuso0oQLu6ZqtpCkH5E=; b=ktIMstyFZIuLMGJet8p8xGY3O3GLZwD0rVqLhvsGTz/KuZhEH2PjyVtPb0qCOyfrZH tUIOCkqHA+RjbeHYyxKc9CingxQnH8pskaGjzr5dtgtIXYD50IGac2azb7DkB8yUNXZV KUYwLTaP+VrJIxXsrdros6gkEaS8MgAJK+mFu0nqGWWIrMZDB+i0poLP9sa8o2hH3twO /3PWaOYQ5O3srO0M6wrf5mEe5JKBi+a1HvL17yXHQxgJ2f1vbBbHIrpyFQRgYJI5Z5xe jqNr14sELXHOBmtaBJE4rL8GA60sMNZukHzoe5vDlWxsZtmBdGu8kRD5AOuiXJOw4VYR 7cXQ== X-Gm-Message-State: AOJu0YxMPFPcpuR3wu1+u03M5Xbj4MkGduEdHxGhVrUCNiobPc7pr5m0 Sci5lK2fOiZnysuC3c/EsUB86gXFFOpHvoD4tBwMETCy30d38O44bFtlxf5s X-Gm-Gg: ASbGncuwdccHUhBOKgT+Ze1paOPtplwkyHlvLDyhZZrf3tDAh6/GRosUqMGr4R7xMfb 9/H2NXsHM9zSYlO2JEjptecc5Cesn1uKA4t7SREFAUlGCJahgLSIDGM5u9HaBqV1b+TT2+58mnH o8YQ9Xu5kFSX0C1PBi18b+v7T1iSrZl8V0VP0iu/NUhqoFkpL8NLLj2Bv//sjD++SI4B2c5qw73 VhNYEstavXhGYMycohTZNA1eKGQUcmnC6RZgvfAX1DUZ2urVcverIP3n6s1w4/GuHbNQ0EanswV ZSRHtWqCS3HQ8/WVtx5OwWHxOcc9Nyk1k3SiG2ftcBbVuufbEha49bGuqOKiEJGeU49VDQ== X-Google-Smtp-Source: AGHT+IFihrZmPMxiU3Y85cpWWXBZjcfq/hVAu3R54g8peZErJ6ML9Fm7xLD/uv+tJ9F4r+DqBMDJ4w== X-Received: by 2002:a17:902:e884:b0:224:249f:9723 with SMTP id d9443c01a7336-2262c6241bbmr34244305ad.51.1742299161226; Tue, 18 Mar 2025 04:59:21 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:20 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 1/9] config: teach repo_config to allow `repo` to be NULL Date: Tue, 18 Mar 2025 17:28:53 +0530 Message-ID: <20250318115912.2978992-2-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The `repo` value can be NULL if a builtin command is run outside any repository. The current implementation of `repo_config()` will fail if `repo` is NULL. If the `repo` is NULL the `repo_config()` can ignore the repository configuration but it should read the other configuration sources like the system-side configuration instead of failing. Teach the `repo_config()` to allow `repo` to be NULL by calling the `read_very_early_config()` which read config but only enumerate system and global settings. This will be useful in the following commits. Suggested-by: Junio C Hamano Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- config.c | 4 ++++ config.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/config.c b/config.c index 658569af08..e127afaa8f 100644 --- a/config.c +++ b/config.c @@ -2521,6 +2521,10 @@ void repo_config_clear(struct repository *repo) void repo_config(struct repository *repo, config_fn_t fn, void *data) { + if (!repo) { + read_very_early_config(fn, data); + return; + } git_config_check_init(repo); configset_iter(repo->config, fn, data); } diff --git a/config.h b/config.h index 5c730c4f89..29a0277483 100644 --- a/config.h +++ b/config.h @@ -219,6 +219,15 @@ void read_very_early_config(config_fn_t cb, void *data); * repo-specific one; by overwriting, the higher-priority repo-specific * value is left at the end). * + * In cases where the repository variable is NULL, repo_config() will + * skip the per-repository config but retain system and global configs + * by calling read_very_early_config() which also ignores one-time + * overrides like "git -c var=val". This is to support handling "git foo -h" + * (which lets git.c:run_builtin() to pass NULL and have the cmd_foo() + * call repo_config() before calling parse_options() to notice "-h", give + * help and exit) for a command that ordinarily require a repository + * so this limitation may be OK (but if needed you are welcome to fix it). + * * Unlike git_config_from_file(), this function respects includes. */ void repo_config(struct repository *r, config_fn_t fn, void *); From patchwork Tue Mar 18 11:58:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020859 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 8033420B80C for ; Tue, 18 Mar 2025 11:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299170; cv=none; b=DkHRkBKYi1r9AafESPp8u3ZR9Y0mwOCMoftYRHrZ2FQnE2+y1neFGVcBrgRMfQjEM2RIMRKyjGubgNLM2ISiw+6jKO40cwZLnoNw0MvnoGDlmtfoV4G19qvMfJ91mpRgbpFwwvCFz2cqcP/a4E0A+ui+PrVnvzVS2yScTgQ85UM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299170; c=relaxed/simple; bh=JAJbSWuFJgB3UDNULyyBg5saO01KET8wLRD6PmDumWk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hyyr8sEdGAnjTdWKJR6Y5dtmRKQlONE7sKnqTe3LKfKlQwZbody8svuvQYir6Y9Gr22SyIJ8Huj4PBPV4BuT6Ts/yptPK55ocqEl1Y3r3W9o6PZYDVbpDu5H6L2KukjXBfhl3TD5qNvi4o1ykczC9gMg57vUPutvsbAqRcqvu8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lTwaGBvf; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lTwaGBvf" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22359001f1aso58254605ad.3 for ; Tue, 18 Mar 2025 04:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299164; x=1742903964; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YS369oUw4eRuRr2YFC8W8hxX9W24rD8Bi7rbrICFRVs=; b=lTwaGBvfy3ECcVeABDv5wQz2gdLhXRvEPRmqMvrBh6xEM1N0MOYSLsbJDi6uF3BZHS nO2RaCzlzWxq8ixjoIS6ywJEGwLczkkYxLNldIDTKGYKokQTBUo8eFsEfPyALHVse/On Yepv7K7VOa9HyoatvyTBZ/bbBaIAlpo74uIK8a0l1adTTZQa/KE22JhZVXLw0sNm64sJ GzdH30rblXORJq7czJJDEyVBEnY8h9HnviHpcK7xzlJh2Hoifx1Fzd8ZWn2kdKjWqqbT a9AfaFf2FYj0MsDO/e/hWxZreAiq1rfdwGVGNDDkRb2uzR8jybVYSGc7rhSVothCUYE0 RRHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299164; x=1742903964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YS369oUw4eRuRr2YFC8W8hxX9W24rD8Bi7rbrICFRVs=; b=f+G3ww9XEn+mscTz6jT4M/eXx3z+9tFnfVwS1k7tfm0ZmadK2VoXmpVv1p3tscunJg GV216niza99iiXq+g+4RGae0tSRsQDGAIT9IRNzXeKHztxjubMsnbMIPtYZWuaziTJWZ vnogGsSvAcMnkc3C+uiSJHgT1qYTvmoLuU+ipIbVMhVLSnQOa0Ot6NNKRdYQGdvk4OtW ktiPZ1+OjsTQpQZc6rxSzqcjGehWFTwmr9nN2Qe5t1f9dOkAYSCkQydpljuBv+ItRrrZ d4xRg8wvE2dScdsfX1ZYHbUeSVZg0OgetHh8GDyW+vLHWxO451/vbdQbnJzg/sys+Wyb H0Ew== X-Gm-Message-State: AOJu0YwdfT6fWHwER877iNSjrcyoclVuvkXHBU/84pHPwGUmbhRB3JPy AvPk/PNUrKzKnd1YMJ+KkvaEG4zlnM5GoO+NS2BiAWDmFztVOU2OTG+ptiq/ X-Gm-Gg: ASbGncsWTkdhS8+AIRGzB9Lvg+VN6D//9ZvnLzaOiUA4qGOYPOsEpiIbzxz1JHLBS9V rwDzlRR9/cUzedXlEQcgvNh9DKiNo0JZl4mce/yG+lTB9KTTcsAB9NSzn/IU5DIX8tc0nO8ZFtV QsxqwxGWB8YPEee1s/OhmErc0POt+sb9gLGNZUzdXezCCbB6riXwquvCQGnLZKaW14pN1EnCaVP inATm6xfn5mT9qQK2kayQhl1VgwKUVgHruq56t0PJc3blOczp6Rbi/J5WuhyQ33XO3KFA0ECShT 9J0rtPhTGSieVrcDBoKXCLh9i6jH6cYUmGOALjM1Vl9bjOPO14g73apsiemPZunhwg749g== X-Google-Smtp-Source: AGHT+IFDuPpHH0lHw+SWnRsU4wDKppcZOcLNiJzmKspQ87FuBC2mu/PLqh6aX/mmT/ehSUO/AvgsMQ== X-Received: by 2002:a17:902:d481:b0:21f:dbb:20a6 with SMTP id d9443c01a7336-2262c5ecad9mr33681695ad.33.1742299164548; Tue, 18 Mar 2025 04:59:24 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:24 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 2/9] builtin/verify-tag: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:54 +0530 Message-ID: <20250318115912.2978992-3-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/verify-tag.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_verify_tag()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/verify-tag.c | 7 +++---- t/t7030-verify-tag.sh | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index f6b97048a5..ed1c40338f 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -5,7 +5,6 @@ * * Based on git-verify-tag.sh */ -#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" #include "config.h" #include "gettext.h" @@ -23,7 +22,7 @@ static const char * const verify_tag_usage[] = { int cmd_verify_tag(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { int i = 1, verbose = 0, had_error = 0; unsigned flags = 0; @@ -35,7 +34,7 @@ int cmd_verify_tag(int argc, OPT_END() }; - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); argc = parse_options(argc, argv, prefix, verify_tag_options, verify_tag_usage, PARSE_OPT_KEEP_ARGV0); @@ -56,7 +55,7 @@ int cmd_verify_tag(int argc, struct object_id oid; const char *name = argv[i++]; - if (repo_get_oid(the_repository, name, &oid)) { + if (repo_get_oid(repo, name, &oid)) { had_error = !!error("tag '%s' not found.", name); continue; } diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh index 6f526c37c2..2c147072c1 100755 --- a/t/t7030-verify-tag.sh +++ b/t/t7030-verify-tag.sh @@ -7,6 +7,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh . "$TEST_DIRECTORY/lib-gpg.sh" +test_expect_success GPG 'verify-tag does not crash with -h' ' + test_expect_code 129 git verify-tag -h >usage && + test_grep "[Uu]sage: git verify-tag " usage && + test_expect_code 129 nongit git verify-tag -h >usage && + test_grep "[Uu]sage: git verify-tag " usage +' + test_expect_success GPG 'create signed tags' ' echo 1 >file && git add file && test_tick && git commit -m initial && From patchwork Tue Mar 18 11:58:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020860 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 26680204080 for ; Tue, 18 Mar 2025 11:59:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299171; cv=none; b=EwraMc8lYRuQTH2F0Y1C6+ZGPWEBt/Ohy2LLZpdZ5md5JhG+QQ0sIwv4M9SBfpB7zYTfoy+3G5K/YjCC235yL2vp/qN7GqCFALvCaigo/0fnutmTJBpur8BG+uLfFmEzAay6VV1vyP8/ongYyygZhdzEUi9uVdHpP3ZevELMZ+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299171; c=relaxed/simple; bh=U6cmTbxV4tCdvBmncexg+swheF19OVuQ+W1ra8DB9vQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IMBAdZWmzBgqSVjd5YMos3IylNITVcSILDWMA3XDgEdMllxrmMTZ3Uu0h8LL7HcKiO835s924EwDs7ijlafpsOLX5Rz0KhN0eCkBzpw6Ib3/G2WJo3rqr1jtSUoR1AFCKy/jZKfOv/0OHnkAUV+pZBFEFSXyOMRxPnJ/94G6t/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ac/QaaTi; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ac/QaaTi" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22359001f1aso58255995ad.3 for ; Tue, 18 Mar 2025 04:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299168; x=1742903968; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PzH0GxcUvPZP2/UeP0dJFg2sRLWgXweOioqvjIfY+08=; b=Ac/QaaTijm/yijHHhtTOsj3u8/ISe/+hDyJ6/yTxTFHsfqdrF6cgJQxuhXkISGDPaN wiPgDo/eIAVE0M90uYvg3OEe11y7yQZkP7/aUbYbTWeoYgrQFkd1hf84oU76NIdEqcuj 3aymzbnAD7LCgUmKgX8WcneYw4ky+MHKoJyWvYKqFCwwKPuPme8KT4URwTrmICJeyN7Z PMcldeL3VbhHJ5iMEaTW+9cy3mstgS+/H+ujjAyAMjOPX01822c5w+Ah28C/EIX/I7l8 7uxccxS3/Vry+rykb5Sa8UOwC6an8Nyf1H+bGm6Y43Fynb5gUzj3Pw5zLa4tEeA/j6qT kSSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299168; x=1742903968; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PzH0GxcUvPZP2/UeP0dJFg2sRLWgXweOioqvjIfY+08=; b=kp1JPLbGxbiBwFbDRsTFESqxPzc7dIK9mrCdVlYg65PanoZxD0+vMRPRETDdFSROvS NMvMhsnSlTFu8V76l7MbYZ1cXTxHUHFBO3fAYO+MUheEiUQu71LihRVi2q6vXJK3QCXf MoR7ZO2+H8B3GeZDRbkWku2l5uFppoMYsW5vIUUcAbwrpkRe6MHe5KJ0raPItLIolkjD fGAlvTeGJtnGA+UIg/9fsDh3h/UWKHsU2KlX56LnLQOfptK/Hmo1iUaQbES7sTT0w2xu Zt2/AcScsFCLBPdlk0CNepUgjS9WWDqcz7hi0oM+ID1SxcgC5PtZsX1YBmVS5sRB0N3H e+Mw== X-Gm-Message-State: AOJu0YzLu1/4W5lhLj+tt6L+SVQrTfOyqp6NWpUGFukAM/QBEbclJWWW dfsq9TKfos7qCHZdcEDNVDqqAQaCVIdyugtQ7hbaOZGqnU02+vEfq0pfwqI4 X-Gm-Gg: ASbGncsHWtK0ytgG2g7wtvgpJygCOqVNMHp5v1b6lVyM4HjCNKdS9PDD5Lolvwo1gGR /CJMUCmadUD5nyxOeHL1rKSFQ8qj4i7OJcpuRHjFSYqaTAlMzf6Gj0Nz7CPWBzF7NGif+ikkKbO 3ap3wDHyMTtD6G3aXawSD0CcqFs28s3dnSTzqaCgkBk+uJM7jeNS7+1QPuzF/gi/Y7vorX9KbiR EaYRaBbo1tpsKpzCxZWVGqCVhwEE8pe1dqGtDRXHbW6Nba0mzMUUMVzXUppjjDyFaI4hTF4WZqu k9ixb7Z+nK81n+Ko/nR6XU8+eRzbMM9fLQ7aJxkVVRZ0pbC6mlCxCjGimR566ONIiC28Tg== X-Google-Smtp-Source: AGHT+IHxsPdscrIivpEusdZXlHvUQf7gM9G5t6QkiNK6+eClq9RwZ1W/JOa1pwIBhXUFwh5JOIjf9w== X-Received: by 2002:a17:902:ce89:b0:224:13a4:d61d with SMTP id d9443c01a7336-2262c55f498mr46179335ad.23.1742299167867; Tue, 18 Mar 2025 04:59:27 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:27 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 3/9] builtin/verify-commit: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:55 +0530 Message-ID: <20250318115912.2978992-4-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/verify-commit.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_verify_commit()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Pass the repository available in the calling context to `verify_commit()` to remove it's dependency on the global `the_repository` variable. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/verify-commit.c | 13 ++++++------- t/t7510-signed-commit.sh | 7 +++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c index 779b7988ca..5f749a30da 100644 --- a/builtin/verify-commit.c +++ b/builtin/verify-commit.c @@ -5,7 +5,6 @@ * * Based on git-verify-tag */ -#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" #include "config.h" #include "gettext.h" @@ -33,15 +32,15 @@ static int run_gpg_verify(struct commit *commit, unsigned flags) return ret; } -static int verify_commit(const char *name, unsigned flags) +static int verify_commit(struct repository *repo, const char *name, unsigned flags) { struct object_id oid; struct object *obj; - if (repo_get_oid(the_repository, name, &oid)) + if (repo_get_oid(repo, name, &oid)) return error("commit '%s' not found.", name); - obj = parse_object(the_repository, &oid); + obj = parse_object(repo, &oid); if (!obj) return error("%s: unable to read file.", name); if (obj->type != OBJ_COMMIT) @@ -54,7 +53,7 @@ static int verify_commit(const char *name, unsigned flags) int cmd_verify_commit(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { int i = 1, verbose = 0, had_error = 0; unsigned flags = 0; @@ -64,7 +63,7 @@ int cmd_verify_commit(int argc, OPT_END() }; - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); argc = parse_options(argc, argv, prefix, verify_commit_options, verify_commit_usage, PARSE_OPT_KEEP_ARGV0); @@ -78,7 +77,7 @@ int cmd_verify_commit(int argc, * was received in the process of writing the gpg input: */ signal(SIGPIPE, SIG_IGN); while (i < argc) - if (verify_commit(argv[i++], flags)) + if (verify_commit(repo, argv[i++], flags)) had_error = 1; return had_error; } diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 0d2dd29fe6..39677e859a 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -8,6 +8,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME GNUPGHOME_NOT_USED=$GNUPGHOME . "$TEST_DIRECTORY/lib-gpg.sh" +test_expect_success GPG 'verify-commit does not crash with -h' ' + test_expect_code 129 git verify-commit -h >usage && + test_grep "[Uu]sage: git verify-commit " usage && + test_expect_code 129 nongit git verify-commit -h >usage && + test_grep "[Uu]sage: git verify-commit " usage +' + test_expect_success GPG 'create signed commits' ' test_oid_cache <<-\EOF && header sha1:gpgsig From patchwork Tue Mar 18 11:58:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020861 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 30AC820B7F7 for ; Tue, 18 Mar 2025 11:59:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299173; cv=none; b=PuALm2mh9G1fy+IsfzMkVFV5qAMVlZvC2PgP7CsHlcBXNjVQWpDp05aol3vLRRzhM2czttGHTNcJYgJc+5UVb3bzvMEd1d8mJkTIc12F2U77+NVF75D+juzGX2nwWPjw+5gX0AG+LtUf8Nb6EvVdnXshi+rRyX/QNcNaf5Mrd4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299173; c=relaxed/simple; bh=6u2NuRnQfBqAIwfT9N+W2cLbTA8vrQV39JvWlFebs8A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QbD0pNmmlQqHq6OalXZKxXhwiNc7nTXkmGr6N4yTeyPX53bzCHnVh14d7k5X1T26Yf8o3XdRagsU7QYyg6peh+R1wYc8F9S4AIJoQy00+GWhzyHuR/4i54Twv7DJTZkh1P5f4Dhh0h/k8hOdsIYsu6wWdXaqVpoZBVYPCiT5jzs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=f5u+Ib8f; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f5u+Ib8f" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-225477548e1so94645755ad.0 for ; Tue, 18 Mar 2025 04:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299171; x=1742903971; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Rb3yS0CVOISQIr4Ol2n4ARfJ+e3EEivkK8XxzJZZK4=; b=f5u+Ib8fzDp/5Sby4o5yJSFVfWEM/xfCCbzTet2Mi23M+r1kMjAX53StXyfvMJOLIB pJUhCMR7N3Aao/mh8ub7aPWCpWN67jzfN1HCLeurqLZ8/3xUE6UdjazvHjuuoJnOhBUJ nc2CZvm0dXBE1IpM1Ac/kW8RFeH0iEa5CeVGlVTU/PD0jtewuHvx6Haj8HntrW7CTtZp 5+cBEfqCtwKiKo8Ocd4t8jUlTc9WAkIduC+MNfSbRGal5EjE9IbIw91OeUi3okOmFY/J 4I65HjnkHf5dLBO2JgP9snUY55scfIr7v3Xb9vRbzjhtFzSDLOFqmg7wdziCpoBXWaFg R/SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299171; x=1742903971; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Rb3yS0CVOISQIr4Ol2n4ARfJ+e3EEivkK8XxzJZZK4=; b=uE0AtXfyRMuiLaOReifUPOW52fPCslxC7jgV8TKUjBQ26QjYO6JkQH9ZTTmB8ybNEE nv6bLGpmOAmLEDQIsaI8HJdHLqR9JSmx53VRDa3tGwwvSdooMZ2M1oJST6lWRRb+242A tDSzkmUokGj/UMeIj6TvkDEa4OTCCUWD2WdSChrwbP/f8gwMhqrs9ji+FU4UTaj+0x3h DEmwbOEP0Z0ujUMv4Kzhe1WQOUzlzWT3qlJJNi2tPfTuGBJyEHWOvRFFM7rIpOhWllU4 ORAEFLMR+gXw517d3pqXc2I9GLhVsC8UQtdcsRpSU5AlAQxXZmX37Qaz6WyR8t71gjd9 O6IA== X-Gm-Message-State: AOJu0YwEqnvKDEia98tlAJtaL5+9Hkl2M+2GxEasbWPQ3I3BgOqw4YJs balxQJv6eplnHnlUQc2BSjPBzkWiaXKCbEXlYonQP0Q0gCAhILCfwr3KCkOc X-Gm-Gg: ASbGncuywlqf1ua1w6rbE24qZIk4xYVX9aiffJbv2CEoFpc1zasDOXIUOc2+UVZf2Po E7jY6zMLWwiGVNfcpwrvQzcY7ancDQeEMJsU7XaG4lft3WguPFAhug2bGvBSD8I8mN7zr75y7L4 HFMYMPi7NRTr55MbkGwp+xL/ET+qYXBGdPMxrpoP6jdDIsQke2V35o9udO431u+7ypjTcTAB/Yc oLLzp568rK0nvgos5jjGyiEmMVGYft9JoIK6a3FeHiCUxJ+oTHYcnNNi3v3wn9ojnyr8bhd4Mdn J4k63jSfWYxw0H4Ff0D9TJSYdChx50mBd/So42fZ7Dgbb3THwthw5iMTnK4fb+VK5wHzYA== X-Google-Smtp-Source: AGHT+IHBbCHbeKdO4qTeP0G4U0Iqroy+53TKFO8uYL/2qOdJmVD9k19D3emlcAMJX+zWBjsroSYcsQ== X-Received: by 2002:a17:902:f684:b0:220:c4e8:3b9d with SMTP id d9443c01a7336-225e0af5b7emr180362325ad.37.1742299171227; Tue, 18 Mar 2025 04:59:31 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:30 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 4/9] builtin/send-pack: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:56 +0530 Message-ID: <20250318115912.2978992-5-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/send-pack.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_send_pack()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/send-pack.c | 7 +++---- t/t5400-send-pack.sh | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 8d461008e2..c6e0e9d051 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -1,4 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" #include "config.h" #include "hex.h" @@ -151,7 +150,7 @@ static int send_pack_config(const char *k, const char *v, int cmd_send_pack(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { struct refspec rs = REFSPEC_INIT_PUSH; const char *remote_name = NULL; @@ -212,7 +211,7 @@ int cmd_send_pack(int argc, OPT_END() }; - git_config(send_pack_config, NULL); + repo_config(repo, send_pack_config, NULL); argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0); if (argc > 0) { dest = argv[0]; @@ -317,7 +316,7 @@ int cmd_send_pack(int argc, set_ref_status_for_push(remote_refs, args.send_mirror, args.force_update); - ret = send_pack(the_repository, &args, fd, conn, remote_refs, &extra_have); + ret = send_pack(repo, &args, fd, conn, remote_refs, &extra_have); if (helper_status) print_helper_status(remote_refs); diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 3f81f16e13..8f018d2f23 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -55,6 +55,13 @@ test_expect_success setup ' echo Rebase && git log' +test_expect_success 'send-pack does not crash with -h' ' + test_expect_code 129 git send-pack -h >usage && + test_grep "[Uu]sage: git send-pack " usage && + test_expect_code 129 nongit git send-pack -h >usage && + test_grep "[Uu]sage: git send-pack " usage +' + test_expect_success 'pack the source repository' ' git repack -a -d && git prune From patchwork Tue Mar 18 11:58:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020862 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 96D78207E12 for ; Tue, 18 Mar 2025 11:59:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299177; cv=none; b=ujhA8OjD01yvJEdZkbet0v1xNbXk750sRm9w8sAoTtU4O1r/qnM+1Hyo+fmS/uYoHbkwHPJx6eCxbBJc9J2y4UUv+478SYXUahkntTENQ6JpZzzUQ4G2z8F9R1m9HOnJych8IzVPkoPbUEXeEGbSRsxe1Hce1Yw5pii3iwySy+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299177; c=relaxed/simple; bh=XTJrwl6lGzYH/UD6p2YmKN1G1LrAG9X5uWXZIigQmz8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NUsM/96yEMA5UZOrVpqFpwslyX10aWmCKmnwtoicR1EizcwGzkWnR6u6GVhAYkdFhPhBrNYdbvEsfxaE2s1p1UoOIH9BNLrrXCgrvc0H7JN6AyryQjEpOd8N0L5YvIAnfgESBuYHszS6T/knxUjZRLcqMPZX5ztsUA1/nRNhjwA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TpooIJYf; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TpooIJYf" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2235189adaeso93478355ad.0 for ; Tue, 18 Mar 2025 04:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299174; x=1742903974; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=odxIt6J5cAejMWvEFPdbwTynWI7WHeWNfI/TInK4QPk=; b=TpooIJYfNFuQ6Jgsx88chL65rQ09bQzXYlV7M7/icSVfQscJRQoYtgBGwtREdlDhEl w6oQdy8obrbc82LL6pBnjyhZ2Z86CR5JfnBiGBxD5cm7dkWS46Y4pVNCNjwXzUq9jyT1 Xpo4NVsVZFNXwVLthKQ4aSym+PRoeF8eEF5WlrM5zQFHa00mNJBnsIvOl6naF5GxemRk FDFKZX1dXPioYpiy1mHmssCdMSLzv4Qrna67+wZs3d1Y3nHVr9XLFe3QgCeYS5VQm4S9 sEU6eknG76g4rI9Wf+JqrvFmT+VXrMSVz6zkscVPgHtzFxWOWOPQmJU4Y9sCJLbhPVIb Zrhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299174; x=1742903974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=odxIt6J5cAejMWvEFPdbwTynWI7WHeWNfI/TInK4QPk=; b=fXLHgRNOeYSIWVcy4E7zKYH1hArnPjFHDaVP6yMUNYlha6klyZHZXquAx8/0HadV/e HbvwqnNvCkC1pBjqcRHyMF9KgrUHn5CetANeGjFrLaTWUXZLHLnV22uaXBAta7LkZxlo ikVchJt32No7TYLLjm//YIW9XuAFvvUJT9pvLoN3npfNaYwx6LBH8srfSr7t24ui5pLJ R7MBRAmDMVSvS57lD1+pKbAwmduD3kIU+iFQStY6ar4c7zPlCQMyU47zlDtDLI4R37Q8 ui+poDOsCVMl98hOyGhstUUrxiZSh+AA97ohVsuAy3F3C7mxdYsik0G5Lf0WYkrAkv4J jS6Q== X-Gm-Message-State: AOJu0YxnANAral689mVOGWATA92beGI+hLOW0d8s7NYa/JoCbQPh2AR4 UJLNNhnvco9oJsuGAd+VWfXPPYHzB95N7izNbreh6M7LhSCCkaNkp/fXGh/0 X-Gm-Gg: ASbGncuPrgcaH5Hm4du1VZh0uefysvsXye7rGuR2IgAZzh8zQChYGtSCT84STdduk7x 4xxSIAFMPX3eKL06BT8vOU73xiauVDYjFwKCeELKtFt17Y4MF5teBPSQb+SQZXNOviUafezWx4Q ICId+BUQ7oRyoT+Ry6QQOIU6B0hemNWorYgJT2LhUijWn7qyx6r/C5/WINrVaRjD7uVB4b5wrI0 TJ6X7buDQxOy0KWhYjESMP1CbamQnatQao54dfx3PBSdqDWmk82eaH5Ce19STJBeQ5l4vydjAQ/ gaq159neZN0yb0THj8R1gmp0FNNPaHp1Zlx3gooyswDgzO4R4X98JGuvzAaUyOmPMKK3ZA== X-Google-Smtp-Source: AGHT+IHujTAFKwPWxP8dKT4PXBWsMTN61/3CTLOtkg7ppFiXiWnfrWtRNQDHrlOTVRFiGlHolujZPw== X-Received: by 2002:a17:902:c950:b0:223:fb95:b019 with SMTP id d9443c01a7336-2262cc4a926mr41601675ad.24.1742299174595; Tue, 18 Mar 2025 04:59:34 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:34 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 5/9] builtin/pack-refs: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:57 +0530 Message-ID: <20250318115912.2978992-6-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/pack-refs.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_pack_refs()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/pack-refs.c | 8 +++----- t/t0610-reftable-basics.sh | 7 +++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index 4fdd68880e..e47bae1c80 100644 --- a/builtin/pack-refs.c +++ b/builtin/pack-refs.c @@ -1,5 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE - #include "builtin.h" #include "config.h" #include "gettext.h" @@ -15,7 +13,7 @@ static char const * const pack_refs_usage[] = { int cmd_pack_refs(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { struct ref_exclusions excludes = REF_EXCLUSIONS_INIT; struct string_list included_refs = STRING_LIST_INIT_NODUP; @@ -39,7 +37,7 @@ int cmd_pack_refs(int argc, N_("references to exclude")), OPT_END(), }; - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0)) usage_with_options(pack_refs_usage, opts); @@ -52,7 +50,7 @@ int cmd_pack_refs(int argc, if (!pack_refs_opts.includes->nr) string_list_append(pack_refs_opts.includes, "refs/tags/*"); - ret = refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts); + ret = refs_pack_refs(get_main_ref_store(repo), &pack_refs_opts); clear_ref_exclusions(&excludes); string_list_clear(&included_refs, 0); diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh index 4618ffc108..002a75dee8 100755 --- a/t/t0610-reftable-basics.sh +++ b/t/t0610-reftable-basics.sh @@ -14,6 +14,13 @@ export GIT_TEST_DEFAULT_REF_FORMAT INVALID_OID=$(test_oid 001) +test_expect_success 'pack-refs does not crash with -h' ' + test_expect_code 129 git pack-refs -h >usage && + test_grep "[Uu]sage: git pack-refs " usage && + test_expect_code 129 nongit git pack-refs -h >usage && + test_grep "[Uu]sage: git pack-refs " usage +' + test_expect_success 'init: creates basic reftable structures' ' test_when_finished "rm -rf repo" && git init repo && From patchwork Tue Mar 18 11:58:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020863 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 01B9B207E12 for ; Tue, 18 Mar 2025 11:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299184; cv=none; b=ZPSvAUH5QMxuH4apaQ3GMoY3bjOh8w3AFRPGgorRa/LuT2UVVE/ULxdPaKN3uHA8m03trDQfbkgITgFqNgRKZXCEb4x2RuH7Dp1gyqobWRBnDzH4mrx5ZqZHoREbNOIJs/bD8S6LpTUY8kAKl6m9TzliQYHD4cqRfyrFlpVxfCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299184; c=relaxed/simple; bh=uyPEZR42xGEUWWqABH7AINQb5hhX4uxPZN3aXjnIdLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sym4GQ5HtMkxZ1U0etQUgbV8fXDxGSerkQfAqAujrjiLI9VDaI4aIdD5rbF2zoyB5d2vHkapg/HX8RC8AKUMLhPGY0dVfGdjKGCs/13kL+64FO8ZBKJuPQhjX+lJ0VDusIqPm+D7u6aeZYV2RCFovzO+B5NkOpg3XmLiDwxkvls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=j/wWEXWZ; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j/wWEXWZ" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22359001f1aso58259915ad.3 for ; Tue, 18 Mar 2025 04:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299178; x=1742903978; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4mTtvDBKpgj+WV6qsVkiH+6irNu3ohNrVLzshn7Enuw=; b=j/wWEXWZNYjeZzXfnFE7bLeOtdeoRH7MHfoAGNwKOk31gQNisLixVNLcPSjF2Z+CSC 6/P32IGGANZFVAGYvQDAQ52JQLQnLyKf7fKAuAZTRp2JQUe2+BkQW7M32aH56kOEzPAM /eAAihc71/Tr3/XgQji/8SWcGqRtDrp2P+8vc4VBDiLy9+L0j2RYr/hdg1kQLDeVGxSx BiYGcBYAEybKcAfiG/F6PjsA8+ZICVkE+JxyYUm56+4OKtFjZ0PpqIL/sXARksqEqOXD a0Vk3Nxpmp+Pe7Sf33dsmO7bxJVdITBwXBDZy/kW3o6FxXj6v3FEuzRO+SlAQVfDHcmD cXhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299178; x=1742903978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4mTtvDBKpgj+WV6qsVkiH+6irNu3ohNrVLzshn7Enuw=; b=Kie26CSb3YTbP4IjSkrLqW0ANZkLyNEmzKUasOwqipBtJLa1kZfgUsY61y+iume72g nFwU6SPX6z+wrUdiSK5nTt88ZE1ztl2cE+oZuIZY5Kd5Iz0xwBkMcSc4cFOrhmJuTEs9 9s7bysQIi/sxU/VZDAIbfvLvmH52oGFC5i6Vwk9lY6K5xxAmU2ikbjRSwaPQ1vo7WTKG vR0lElpTOIphFQZcPZ/mLGHqxVT+3ETiZZGgO5qw5rlXx3HHGuo6ngl7miD2aHFwo/hd QKEAGkmQrNTLNDRJZrjFQVSGAtR+vJeqabgNK18K3DTxgYzo3VDLv3QlIVOVZXIQDEat g22g== X-Gm-Message-State: AOJu0YyQp5f+le3gKBbvPxgpCrIHlckooGmoE677iqGCpO1Dn4IcuFVV rDQ2nRKAJi/HmyLHFAlewarDBjo/il3dQr6BZN+z7PfSVeIFZ0fxAcQlCkRH X-Gm-Gg: ASbGncvfPVoTVxqxhyK6MAUTXjdyTeX4+wrtCKo+bnE1CnErtHultX1mvQen+tbaFbd XEDKVzNyWhw9eunU2nwcwUNcxlqc0eqAI7x66l9ghcxVaPkij4ThoZF7k5TVc7QyaZYK3G2MQGR vpuREusUMQOGUv0JoHkW3TVURIob0QVOOrYU9bxaBU2c8X2MjecdFglRKiufLtgX/V4aiL0vwzi QMjhlI9YpUqpvoJSuZ7n0aANFnVEERm3AN/hNWtrIehqVGwh1uUWQENO+ug7yEIjvy8HAjOz2n9 nDry5UVDYrmXkQqzNIzS3UjnmKPToQ6x+08F6cv+yIMZf6KfQ7m7MCDjXgasDv4aCN+z2w== X-Google-Smtp-Source: AGHT+IFzuVS6xJFR4I3MJpJxxUCNFkkNBvcIAdsqZsm44KpMfMO1p1S5RIzx3160+mFwsG5VRlYRag== X-Received: by 2002:a17:902:ced0:b0:224:584:6f04 with SMTP id d9443c01a7336-2262c537c85mr36206385ad.18.1742299177970; Tue, 18 Mar 2025 04:59:37 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:37 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 6/9] builtin/ls-files: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:58 +0530 Message-ID: <20250318115912.2978992-7-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/ls-files.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_ls_files()` function with `repo` set to NULL and then early in the function, `show_usage_with_options_if_asked()` call will give the options help and exit. Pass the repository available in the calling context to both `expand_objectsize()` and `show_ru_info()` to remove their dependency on the global `the_repository` variable. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/ls-files.c | 32 ++++++++++++++++---------------- t/t3004-ls-files-basic.sh | 7 +++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a4431429b7..70a377e9c0 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -6,7 +6,6 @@ * Copyright (C) Linus Torvalds, 2005 */ -#define USE_THE_REPOSITORY_VARIABLE #define DISABLE_SIGN_COMPARE_WARNINGS #include "builtin.h" @@ -245,12 +244,13 @@ static void show_submodule(struct repository *superproject, repo_clear(&subrepo); } -static void expand_objectsize(struct strbuf *line, const struct object_id *oid, +static void expand_objectsize(struct repository *repo, struct strbuf *line, + const struct object_id *oid, const enum object_type type, unsigned int padded) { if (type == OBJ_BLOB) { unsigned long size; - if (oid_object_info(the_repository, oid, &size) < 0) + if (oid_object_info(repo, oid, &size) < 0) die(_("could not get object info about '%s'"), oid_to_hex(oid)); if (padded) @@ -283,10 +283,10 @@ static void show_ce_fmt(struct repository *repo, const struct cache_entry *ce, else if (skip_prefix(format, "(objecttype)", &format)) strbuf_addstr(&sb, type_name(object_type(ce->ce_mode))); else if (skip_prefix(format, "(objectsize:padded)", &format)) - expand_objectsize(&sb, &ce->oid, + expand_objectsize(repo, &sb, &ce->oid, object_type(ce->ce_mode), 1); else if (skip_prefix(format, "(objectsize)", &format)) - expand_objectsize(&sb, &ce->oid, + expand_objectsize(repo, &sb, &ce->oid, object_type(ce->ce_mode), 0); else if (skip_prefix(format, "(stage)", &format)) strbuf_addf(&sb, "%d", ce_stage(ce)); @@ -348,7 +348,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir, } } -static void show_ru_info(struct index_state *istate) +static void show_ru_info(struct repository *repo, struct index_state *istate) { struct string_list_item *item; @@ -370,7 +370,7 @@ static void show_ru_info(struct index_state *istate) if (!ui->mode[i]) continue; printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], - repo_find_unique_abbrev(the_repository, &ui->oid[i], abbrev), + repo_find_unique_abbrev(repo, &ui->oid[i], abbrev), i + 1); write_name(path); } @@ -567,7 +567,7 @@ static int option_parse_exclude_standard(const struct option *opt, int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix, - struct repository *repo UNUSED) + struct repository *repo) { int require_work_tree = 0, show_tag = 0, i; char *max_prefix; @@ -647,15 +647,15 @@ int cmd_ls_files(int argc, show_usage_with_options_if_asked(argc, argv, ls_files_usage, builtin_ls_files_options); - prepare_repo_settings(the_repository); - the_repository->settings.command_requires_full_index = 0; + prepare_repo_settings(repo); + repo->settings.command_requires_full_index = 0; prefix = cmd_prefix; if (prefix) prefix_len = strlen(prefix); - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); - if (repo_read_index(the_repository) < 0) + if (repo_read_index(repo) < 0) die("index file corrupt"); argc = parse_options(argc, argv, prefix, builtin_ls_files_options, @@ -724,7 +724,7 @@ int cmd_ls_files(int argc, max_prefix = common_prefix(&pathspec); max_prefix_len = get_common_prefix_len(max_prefix); - prune_index(the_repository->index, max_prefix, max_prefix_len); + prune_index(repo->index, max_prefix, max_prefix_len); /* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch) @@ -748,13 +748,13 @@ int cmd_ls_files(int argc, */ if (show_stage || show_unmerged) die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u"); - overlay_tree_on_index(the_repository->index, with_tree, max_prefix); + overlay_tree_on_index(repo->index, with_tree, max_prefix); } - show_files(the_repository, &dir); + show_files(repo, &dir); if (show_resolve_undo) - show_ru_info(the_repository->index); + show_ru_info(repo, repo->index); if (ps_matched && report_path_error(ps_matched, &pathspec)) { fprintf(stderr, "Did you forget to 'git add'?\n"); diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh index a1078f8701..4034a5a59f 100755 --- a/t/t3004-ls-files-basic.sh +++ b/t/t3004-ls-files-basic.sh @@ -34,6 +34,13 @@ test_expect_success 'ls-files -h in corrupt repository' ' test_grep "[Uu]sage: git ls-files " broken/usage ' +test_expect_success 'ls-files does not crash with -h' ' + test_expect_code 129 git ls-files -h >usage && + test_grep "[Uu]sage: git ls-files " usage && + test_expect_code 129 nongit git ls-files -h >usage && + test_grep "[Uu]sage: git ls-files " usage +' + test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' ' mkdir subs && ln -s nosuch link && From patchwork Tue Mar 18 11:58:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020865 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 3BA922080E3 for ; Tue, 18 Mar 2025 11:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299187; cv=none; b=DAhX5/PfnNQ5A8Qmv4RnF+fSUz9+egoF+DPQw4G2D/V4sMO/ZXpLzfID/1vwJywveLZKQ9UzbGiQ6caoIb02ESvlYCp7ZZ61iK3zHDQola4xrzWwVFA4+sfg5HXbQlkLAl2RPuehdspCQsYYyhGn0tdPmGmuGgzq4Dk5a5vxKKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299187; c=relaxed/simple; bh=uW5bRQB4XXi6+E31aohFFA1T+pUDf31lBRQLmOnjdyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=umZP8M+3j+rvVirKVzr8dWd0OWo8SZwmcri1S5Nqg4fTkanHa9aGGIoZJ9w9UcCmK3Hp5t7SmeOOwwxAR8emvkm37eADUEk1/7TNOWSMgu9tOuj+0kVo4ms1yXIo2CXoxIPPd1bOZrQS7G8Vc86ijgJ8TndA7iA4/VoEX9zdJwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LzteBi8A; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LzteBi8A" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-224171d6826so5077995ad.3 for ; Tue, 18 Mar 2025 04:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299181; x=1742903981; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iK1MudTOOC0VXfUy+3wi28IDwRwjOzctrPukWuJ73aE=; b=LzteBi8Am06M8jIl9W4c62O8SSmSTPcE6bCX5KJlisZvI09sYyCIInWWLr5yfNcJnu wf+5mBciVsXt759zbdHH09w70cycsx31qUBe1wwGFd6gXOslyRXDM2G2iHl1LEa5+yy8 bVRi3+VT3OMmfNH5DfHtv0mlNNmBZXDshO7CUJOHuoeR39vCi9d5RiOeqzuSRqAsyA96 WT3/m0z7qUncE1aK3rpXM+QeWE+iNcU9AsVEzOPWr/R7HNhAb0PM8R5nsXTZylgn8Ykm 2e6r/MTrr7ob1LDQIPI0L2dGJhaD2Imgsl7pQyQytSjQ0aMsJx0JH5BbIjJ/aZmhvcvi JrLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299181; x=1742903981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iK1MudTOOC0VXfUy+3wi28IDwRwjOzctrPukWuJ73aE=; b=Jh58hjIbeynoGrsEJ8jMzGLBo7q3BYzgKnwrVKXpny4o9Ntaa15yKixnBTqmB97RgW wn/IZZF6/ucBcO7WKWjGM5Mqt6Sxo7TDvHloEMgbfkhlZMkmku/pSklv3iXinw1CdNlw HxZg8vjBVla29Dj+B2X814mWptrLK8myjisbgXDsmMC4hh1q59mYZhN4xkn5YeZ3Q/j0 +gkCw2saRVkj4q+23HpeXHaCBgXpFOkjnGjjVr0578JQ//1Z+QlLqRPt0lZ8mW8eVpKF RKzl/nrReqiW93clUBCO0MSw21APxzeoS6vcbcRlpweFcUDEqGxgnwtguxgWW30tJy6x ZsYQ== X-Gm-Message-State: AOJu0Yy0WsbuIR8kHN2XfokjAGU/j/Si6tItnjrG4LMZjW2YgUrAmVbR xGA8g6OMR0ETa1lHSSDG2WoihwHHROzBd2zroOxpxW0iyYaODJcd7GEJnMi0 X-Gm-Gg: ASbGncskzFnGgePHyoIaM69yQo+Fs2QrLru+P9l3ahSbjzMBSosc2ykIllD0hbOGgXp CS4tiCAKQX2Li1TmmQj2IgRrjnxYk3Dn7X4SM86+GtqzkFVMj4X3Pmz5IwvZh+5T+0j7V+tljNA evtNnw6fME0W56rTL7OXYl5P0wUvV6v1sOM3mm+ZytF/7rlf9wdN+P0Of9pJSjFZ68+Y4FqTYHl +BIP1aio+XDXwD4d9K36KyyaAH12mADZTRWzSqwqcsptBmfT+YMBL7QIfrJ15HPN9SfjHExWeba g18Xi0t5zqnYOWSlxHU9N9cd3IRx4WBVpX39r0ya+1Tv4oGZhnFHidlpos2JqcwDe/GUvg== X-Google-Smtp-Source: AGHT+IFyCHtIW5nCqo9oCA4DYK7TPkv6QnJKMkO+gqLp6nXW/UVdw/t4PetETnjmfIkoYscdSBVUIg== X-Received: by 2002:a17:902:f70c:b0:224:191d:8a79 with SMTP id d9443c01a7336-225e0ac31aamr212965045ad.27.1742299181287; Tue, 18 Mar 2025 04:59:41 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:41 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 7/9] builtin/for-each-ref: stop using `the_repository` Date: Tue, 18 Mar 2025 17:28:59 +0530 Message-ID: <20250318115912.2978992-8-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/for-each-ref.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_for_each_ref()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/for-each-ref.c | 5 ++--- t/t6300-for-each-ref.sh | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 8085ebd8fe..3d2207ec77 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -1,4 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" #include "commit.h" #include "config.h" @@ -20,7 +19,7 @@ static char const * const for_each_ref_usage[] = { int cmd_for_each_ref(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { struct ref_sorting *sorting; struct string_list sorting_options = STRING_LIST_INIT_DUP; @@ -63,7 +62,7 @@ int cmd_for_each_ref(int argc, format.format = "%(objectname) %(objecttype)\t%(refname)"; - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); /* Set default (refname) sorting */ string_list_append(&sorting_options, "refname"); diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index a5c7794385..9b4f4306c4 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -292,6 +292,13 @@ test_expect_success 'Check invalid atoms names are errors' ' test_must_fail git for-each-ref --format="%(INVALID)" refs/heads ' +test_expect_success 'for-each-ref does not crash with -h' ' + test_expect_code 129 git for-each-ref -h >usage && + test_grep "[Uu]sage: git for-each-ref " usage && + test_expect_code 129 nongit git for-each-ref -h >usage && + test_grep "[Uu]sage: git for-each-ref " usage +' + test_expect_success 'Check format specifiers are ignored in naming date atoms' ' git for-each-ref --format="%(authordate)" refs/heads && git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads && From patchwork Tue Mar 18 11:59:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020864 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.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 AC1A520B818 for ; Tue, 18 Mar 2025 11:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299187; cv=none; b=QHHazdUDMqggOMmDKvoMIEJK3eNBUhrnexhlbZ18h24lDyRk3kFEXZUsthOD1ob6G11JMFEOnNoFj8fT/E4C2zCG3WrE8lf5S1htRMwuF4B+LsAXU6s/UUTyjzJ1rDmHmiYk4MCYr1xD2XaTUmSsgiH+x8BEGGdCeuIJQMDXIQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299187; c=relaxed/simple; bh=TG99l56WB7uG4AXm/m6Glul8x/2FBo3QBSFbry78VAQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mtWp76kXThemHvaBG2bBlfT6KVmJmoo78pPpuflbLCjgUfRZbiYU3/4131p3vYh5zuR5Z4f5YNdXGzTGSLFyeK9NF3KrJ5p4cBNfpYKStF/qHbOYtvkfAIXEtg+E3NpnUgeuS2yncApEgMIItH0yKLV9Mx7Aq5Gi/HswLg+VBw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KGk2Jlsn; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KGk2Jlsn" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2260c915749so30132005ad.3 for ; Tue, 18 Mar 2025 04:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299185; x=1742903985; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5ZagCCvp4BrHRFQq8PkN50cz/wHDlWnYErUpQ8WNHbY=; b=KGk2JlsnnvYYgt3FtMPKGiH4zYCXwU8UqL2bl7CVOocHmGl1OFa7Gn5U/ccUDnbro+ x7ztkrIBcM5/n3t8YDrKsSbfMX4Jw9zDdi/8nLf8yQO03CPCEtgJnhpXlILx1vayj2Wq SHnBGuFHJEHJKuX5yp81PoY6Bsxrq1jNt5eD1LjtT9yzQ8esWr1Xqyz7wwemTrPZq2XY TIMKqoApqemHmmEy10/EW9q+GZQkEqkR6w+dQxrGFVdEldx9Q2uT/r7y9kqgmQk3jpII LNF4ucJGjfi1Od8TM1nkjHJzOfFIkAaFPwIfkcu/ncreLuMLV71TgzPNrw+WmFWaHpR4 E+Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299185; x=1742903985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5ZagCCvp4BrHRFQq8PkN50cz/wHDlWnYErUpQ8WNHbY=; b=s+XUxQIbClDT+Ne8o20lTiW7eVkdP6YKDXcC4ExTl63MzTqaGldpAFm+Yqnuuxa+GH aVOGk/7q0fo7Pn2VQtBiZGzSwcmPhK86DlhZbV7KC5sZEhSZOAKoV+3WS6L3yfrq1AVw 0DxZjk98PtdbkEVMBoE9K6siurhtjN1gvdTZrOkPh4mZFYcoMm2bB2Yz6cllWygaiKkz KCHwGlUbhbvvgIfHAkXgz4b6+Xbgl1hBkKGH+V5ABdCTvUo5AUK3THrQS64mwkjVbSY/ PYiY2OHCPgg2LjrkeJKB3C/gm20vkJf4Zg7qFVQThBbPqv6X6iD4goeR/X5aW85CdA1M RU7Q== X-Gm-Message-State: AOJu0Yz7NH5xPQyBgIXRATK4a+d9RHnAx+75b5hGzAQxJnlfkSns3zV1 jR7BnFlnbiYJ0wIUBN7ZBiTS517S5G6vyuBGL84Mv1CY7yWmjMWb6vzUQSwj X-Gm-Gg: ASbGncss0M5k5h8JZaCnIClwVKFg9UMqquYE4JAqv3lv3S/+UjTIFRC8cjt/2AdEXd2 4g2Ky7ASq3oaaWM2J2SBaKoUncbCcx4mFT6QGjmpsrKesHaFakUv1mELCLcQSGsKpLHhjzWxuE7 X95vetCee/MxzAv0i/W1BjtaH3qDx4lQtimc2Z9ObwSaKvbFRo7pPn7+mNOvHCFMz/xazDnkt36 isCWTPpdVeXbL7/nUjSMKQLAiSCsNGueiGTOcTTmoRWGBEszvogObETcLLx2xNsUcgxaGhej3Gw Y+zYYUnQ8FPEB96iq0r+qZ+g5eiArIBGi1iPXU/ESwbSTu7PFnsTy+UNvMpiLpwNM4xmGA== X-Google-Smtp-Source: AGHT+IG+oLRNo7EyXmaQmxRZK4MvTz/0DjxU01mmN/to+gXfwyA7Z2YEjiWD1q8NULW36yrOXsym3g== X-Received: by 2002:a17:902:f648:b0:220:d257:cdbd with SMTP id d9443c01a7336-225e0b2738emr249803455ad.48.1742299184653; Tue, 18 Mar 2025 04:59:44 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:44 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 8/9] builtin/checkout-index: stop using `the_repository` Date: Tue, 18 Mar 2025 17:29:00 +0530 Message-ID: <20250318115912.2978992-9-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/checkout-index.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_checkout_index()` function with `repo` set to NULL and then early in the function, `show_usage_with_options_if_asked()` call will give the options help and exit. Pass an instance of "struct index_state" available in the calling context to both `checkout_all()` and `checkout_file()` to remove their dependency on the global `the_repository` variable. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/checkout-index.c | 43 ++++++++++++++++----------------- t/t2006-checkout-index-basic.sh | 7 ++++++ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index e30086c7d4..7f74bc702f 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -5,7 +5,6 @@ * */ -#define USE_THE_REPOSITORY_VARIABLE #define DISABLE_SIGN_COMPARE_WARNINGS #include "builtin.h" @@ -68,10 +67,10 @@ static void write_tempfile_record(const char *name, const char *prefix) } } -static int checkout_file(const char *name, const char *prefix) +static int checkout_file(struct index_state *index, const char *name, const char *prefix) { int namelen = strlen(name); - int pos = index_name_pos(the_repository->index, name, namelen); + int pos = index_name_pos(index, name, namelen); int has_same_name = 0; int is_file = 0; int is_skipped = 1; @@ -81,8 +80,8 @@ static int checkout_file(const char *name, const char *prefix) if (pos < 0) pos = -pos - 1; - while (pos index->cache_nr) { - struct cache_entry *ce =the_repository->index->cache[pos]; + while (pos < index->cache_nr) { + struct cache_entry *ce = index->cache[pos]; if (ce_namelen(ce) != namelen || memcmp(ce->name, name, namelen)) break; @@ -137,13 +136,13 @@ static int checkout_file(const char *name, const char *prefix) return -1; } -static int checkout_all(const char *prefix, int prefix_length) +static int checkout_all(struct index_state *index, const char *prefix, int prefix_length) { int i, errs = 0; struct cache_entry *last_ce = NULL; - for (i = 0; i < the_repository->index->cache_nr ; i++) { - struct cache_entry *ce = the_repository->index->cache[i]; + for (i = 0; i < index->cache_nr ; i++) { + struct cache_entry *ce = index->cache[i]; if (S_ISSPARSEDIR(ce->ce_mode)) { if (!ce_skip_worktree(ce)) @@ -156,8 +155,8 @@ static int checkout_all(const char *prefix, int prefix_length) * first entry inside the expanded sparse directory). */ if (ignore_skip_worktree) { - ensure_full_index(the_repository->index); - ce = the_repository->index->cache[i]; + ensure_full_index(index); + ce = index->cache[i]; } } @@ -213,7 +212,7 @@ static int option_parse_stage(const struct option *opt, int cmd_checkout_index(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { int i; struct lock_file lock_file = LOCK_INIT; @@ -253,19 +252,19 @@ int cmd_checkout_index(int argc, show_usage_with_options_if_asked(argc, argv, builtin_checkout_index_usage, builtin_checkout_index_options); - git_config(git_default_config, NULL); + repo_config(repo, git_default_config, NULL); prefix_length = prefix ? strlen(prefix) : 0; - prepare_repo_settings(the_repository); - the_repository->settings.command_requires_full_index = 0; + prepare_repo_settings(repo); + repo->settings.command_requires_full_index = 0; - if (repo_read_index(the_repository) < 0) { + if (repo_read_index(repo) < 0) { die("invalid cache"); } argc = parse_options(argc, argv, prefix, builtin_checkout_index_options, builtin_checkout_index_usage, 0); - state.istate = the_repository->index; + state.istate = repo->index; state.force = force; state.quiet = quiet; state.not_new = not_new; @@ -285,8 +284,8 @@ int cmd_checkout_index(int argc, */ if (index_opt && !state.base_dir_len && !to_tempfile) { state.refresh_cache = 1; - state.istate = the_repository->index; - repo_hold_locked_index(the_repository, &lock_file, + state.istate = repo->index; + repo_hold_locked_index(repo, &lock_file, LOCK_DIE_ON_ERROR); } @@ -304,7 +303,7 @@ int cmd_checkout_index(int argc, if (read_from_stdin) die("git checkout-index: don't mix '--stdin' and explicit filenames"); p = prefix_path(prefix, prefix_length, arg); - err |= checkout_file(p, prefix); + err |= checkout_file(repo->index, p, prefix); free(p); } @@ -326,7 +325,7 @@ int cmd_checkout_index(int argc, strbuf_swap(&buf, &unquoted); } p = prefix_path(prefix, prefix_length, buf.buf); - err |= checkout_file(p, prefix); + err |= checkout_file(repo->index, p, prefix); free(p); } strbuf_release(&unquoted); @@ -334,7 +333,7 @@ int cmd_checkout_index(int argc, } if (all) - err |= checkout_all(prefix, prefix_length); + err |= checkout_all(repo->index, prefix, prefix_length); if (pc_workers > 1) err |= run_parallel_checkout(&state, pc_workers, pc_threshold, @@ -344,7 +343,7 @@ int cmd_checkout_index(int argc, return 1; if (is_lock_file_locked(&lock_file) && - write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK)) + write_locked_index(repo->index, &lock_file, COMMIT_LOCK)) die("Unable to write new index file"); return 0; } diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh index bac231b167..fedd2cc097 100755 --- a/t/t2006-checkout-index-basic.sh +++ b/t/t2006-checkout-index-basic.sh @@ -21,6 +21,13 @@ test_expect_success 'checkout-index -h in broken repository' ' test_grep "[Uu]sage" broken/usage ' +test_expect_success 'checkout-index does not crash with -h' ' + test_expect_code 129 git checkout-index -h >usage && + test_grep "[Uu]sage: git checkout-index " usage && + test_expect_code 129 nongit git checkout-index -h >usage && + test_grep "[Uu]sage: git checkout-index " usage +' + test_expect_success 'checkout-index reports errors (cmdline)' ' test_must_fail git checkout-index -- does-not-exist 2>stderr && test_grep not.in.the.cache stderr From patchwork Tue Mar 18 11:59:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usman Akinyemi X-Patchwork-Id: 14020866 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 049802080E3 for ; Tue, 18 Mar 2025 11:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299190; cv=none; b=CcTvpeA1eM0qB9VioIVvq6OKtqE7zCgKpsIUXYbClOEJfEdOP1/mYiY5dxDDUR+//Ybh5TNDw8blkmOohV5+wYrh2FHllwknq0xNZ+R5zh2XgLQ7ev+yJcN6ffA1FbmsoVAAylAKaj2UkZsL7CX+gnv++R06USOOLHPdv5X83j8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742299190; c=relaxed/simple; bh=U+XFGoQzxyyJRtz9agM0lv6W5cbWm2Ge0pYfYimKgpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hh4Ic8cF/NBUViWYxrHUsIDyviRCetpDWbz+b2Mm691pZicNDZdFaD+DwEKj29j2qTmpQQ4UwDe6DLaYWIBNyXx0VoSapdptNhOLIUOWN2Fa8BC6S/jlUBLGp/ebm3Xi0/eC/XPapnryLk96g3BWWbv7Zw8l+0hoIo5NXL7+OPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=X29j5B/o; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X29j5B/o" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fecba90cc3so7189330a91.2 for ; Tue, 18 Mar 2025 04:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742299188; x=1742903988; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SDzis9TYFoOOo6McnWKBY+0CzD+vDHSYmKTRS74auv4=; b=X29j5B/odJKH1C8LzC0hb1AvNd4wdUIA9jtpqm0rsb4oDIjjiUW57IwyY1RSaukgH4 t0tMsvDakCSMCGsBMsiwp1Kcs2q6zm9iDjS5CfDdMR/3lA10kmS8vhzbRHOdbSutsOnV 2OdVnC1ieZCW+FmswJBm26/+QZ8rDBMrZu+V6NM5UWcvTlI10bGB6HZeL1SdSUC+fbXB 802FjqvPfPBNqxDZLDfnavgKoXt6C0I5VPs2qsbl7RXUjuVw/v6pRs38vLgMTC1PZ2Es yzFenQiGtPahwJFQKmFDfFMo1OnCRYz5uyOkEdD8lttJja/YUCHt93uZNOlUdMdtXk47 o0KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742299188; x=1742903988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SDzis9TYFoOOo6McnWKBY+0CzD+vDHSYmKTRS74auv4=; b=mYk3aSyYgpNh1wviIjBvBLMM5NkqbNaA2+RUmS1YGEFtoEyhhzThWiRWjQZmxXF1sA Ly+HPPUGy/jecPT/nYzKpa8hAI2M+3sK9N6V+gyy4odM+8LcgMhXYtYMknJ+PHi94kmD yxE8HmGjvPHjHMbT7WoIqgCo/qYx6n3PCWhv69sPJYloH6s2n3swfXKLC4LXLI5zJ+28 OvywojTcI8Rq4qf6UKKZvntZYRcEphAUk6euD4wrLLnKLhPkr0ALWDuOkA3Cm5XfDhdC titSMjI2DcW/ePuegi14oh13DIkfyUbVblKoyNeNWhWGngopo3vTWULvB9Y4UnjBVxrr d7mg== X-Gm-Message-State: AOJu0YypRHiouXgX4Ge6dE8WI4muLvfRDtcHf0UnIIXdPzUh5LoUaF1R rEMTJUVMSCodMQ8GtIRddpKXxbtQM7jPN9ImHUGJeex3PEvqYw6pyeqV9eW4 X-Gm-Gg: ASbGncuKzlfJOazhLt4waQv0e2oUSBzPTwODHDuA/+oa0WUG6MgRuwMKoep8YVOREAF OGq76yBZCbSJ01xWzleNIrVEOQcBG8PnvYQzqSPVq8NLQaoOH7nD+FyH/EQK4pmlzjZWSohP5Gc H55IOQKgQfUnIvAEwmKw6dR8mH6TSdVk55OcTE4q0mc2b33zyr1ATYIa57UbVsOcycakxz2LWBF KPMoEx+g34utg+g02lOIpQ3Pc9hNGd1JiHjftIOUOpAEICUXjig2NomoEWGnRj+fm/vWL+cloEz OEpgQF/GisnSwxmj3jIWU+zN91Xnb7yCJDpjJZniwqwVU64y1Lgzy1GN8cgiVJ/mKuc0JebyUof 2+Izp X-Google-Smtp-Source: AGHT+IEkKIO2yPpGA3WCSq33S91wQ5FrknyL7NyhYDY07X1IpOVB5UO+PHNT+QuXRtbA7CKQDwfWeA== X-Received: by 2002:a17:90b:4fd1:b0:2ee:b8ac:73b0 with SMTP id 98e67ed59e1d1-301a5b02044mr2999742a91.2.1742299188072; Tue, 18 Mar 2025 04:59:48 -0700 (PDT) Received: from archlinux.plaksha.edu.in ([182.75.25.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bc012bsm92101605ad.205.2025.03.18.04.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Mar 2025 04:59:47 -0700 (PDT) From: Usman Akinyemi To: git@vger.kernel.org, christian.couder@gmail.com Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com, phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com, Christian Couder Subject: [PATCH 9/9] builtin/update-server-info: remove unnecessary if statement Date: Tue, 18 Mar 2025 17:29:01 +0530 Message-ID: <20250318115912.2978992-10-usmanakinyemi202@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> References: <20250318115912.2978992-1-usmanakinyemi202@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since we already teach the `repo_config()` to allow `repo` to be NULL, no need to check if `repo` is NULL before calling `repo_config()`. Mentored-by: Christian Couder Signed-off-by: Usman Akinyemi --- builtin/update-server-info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c index d7467290a8..ba702d30ef 100644 --- a/builtin/update-server-info.c +++ b/builtin/update-server-info.c @@ -20,8 +20,8 @@ int cmd_update_server_info(int argc, OPT_END() }; - if (repo) - repo_config(repo, git_default_config, NULL); + repo_config(repo, git_default_config, NULL); + argc = parse_options(argc, argv, prefix, options, update_server_info_usage, 0); if (argc > 0)