From patchwork Sun Mar 24 17:51:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragan Simic X-Patchwork-Id: 13600877 Received: from mail.manjaro.org (mail.manjaro.org [116.203.91.91]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AA1418EB3 for ; Sun, 24 Mar 2024 17:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.91.91 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302687; cv=none; b=SLBQvQT/Lh//cIRKa3KOMKCPv2eHPz+MxpDCThWawcxYudbtCmO/ZoEW4JJnJlH3fTzGq5GnX5d50zg4/HAVhRj1OClxI3B8woO4dIlBC681JOpdjSMMagcAUGU+s3AY1gaw93/543+2MRnO5kEV1zSYqjLfA6wzl80Vy4W9i08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302687; c=relaxed/simple; bh=28rinPfRAsdoVh70bz0iauUpvdwMJnfMmo+qyTwvSvM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Wc1DaWMfZNZhkMCjjjQdOIH6cSxIam1i1vWfDeyckO/9ysn0vX98q4YUPVt42+P/9Poj7DFcoRc1udXPQakc/3aBvJPpqNMjXSA/qJ0yS7TN7fOO2UDD344CYtVSfSABufKHPGePODlFOAPpweVBx/JE0oZ1tqijl6BPSZDWfbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org; spf=pass smtp.mailfrom=manjaro.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b=Nvvth7zz; arc=none smtp.client-ip=116.203.91.91 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=manjaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b="Nvvth7zz" From: Dragan Simic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=manjaro.org; s=2021; t=1711302676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dg+7xj7Ye+JzMmqAI5BCTMwiMDe08e97lMMeZWUn8sI=; b=Nvvth7zzJlm2YEttzWW9djbf8IqPTQoGZudXzCqREvz6N5T4fDry43xydfUKJTENEZDTfh Pe5SyHwFttG085kIOnzyCffaBjL6ZR2JfGTeKbEn/ydtg0jpWhx/L0hLLvJbK/7p4hmKMW JHnmzMlDm1wRLxKPjtLyH436RJdr7kPT8DDrdtSpYUWJrffUBYk5088fDN3eFszrBXi1xw Sn+8ez3+aTJYbphgAlVFPUP1EBBdI4dLsEGbESmy4u0QD9eEEFUZ5SedAOcoffXrOFMUyD z4cl7j8Od3Y51fEpmeMsuCGY4ykPttvEsN5Y7XdDwZqA165QXJB011edyEXClQ== To: git@vger.kernel.org Cc: gitster@pobox.com, sunshine@sunshineco.com, jn.avila@free.fr Subject: [PATCH v2 1/3] grep: perform some minor code and comment cleanups Date: Sun, 24 Mar 2024 18:51:11 +0100 Message-Id: <55867253d2925892f5192dbc3145f7bc9221b791.1711302588.git.dsimic@manjaro.org> In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: ORIGINATING; auth=pass smtp.auth=dsimic@manjaro.org smtp.mailfrom=dsimic@manjaro.org Move some variable definitions around, and reflow one comment block, to make the code a bit neater after spotting those slightly unpolished areas. There are no functional changes to the source code. Signed-off-by: Dragan Simic --- Notes: Changes in v2: - No changes were introduced This patch is salvaged from my earlier series, [1] for which it has been concluded to be not acceptable for merging, because of possible issues with various git scripts. [2] Compared to the version in the earlies series, there are no changes in this version. As expected and as already discussed, patches like this one inevitably raise a few eyebrows. [3][4][5] [1] https://lore.kernel.org/git/cover.1710781235.git.dsimic@manjaro.org/T/#u [2] https://lore.kernel.org/git/d8475579f014a90b27efaf6207bc6fb0@manjaro.org/ [3] https://lore.kernel.org/git/CAPig+cQ6Y2oOaPkKFsD41beXLHjhD++nmf59xrcswpb6_Q-sdA@mail.gmail.com/ [4] https://lore.kernel.org/git/xmqqjzlzt61d.fsf@gitster.g/#t [5] https://lore.kernel.org/git/24093dca675c49cfde39f6d6efca2342@manjaro.org/ builtin/grep.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 982bcfc4b1df..af89c8b5cb19 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -623,13 +623,13 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, struct tree_desc *tree, struct strbuf *base, int tn_len, int check_attr) { - struct repository *repo = opt->repo; - int hit = 0; + int hit = 0, name_base_len = 0; + int old_baselen = base->len; enum interesting match = entry_not_interesting; + struct repository *repo = opt->repo; struct name_entry entry; - int old_baselen = base->len; struct strbuf name = STRBUF_INIT; - int name_base_len = 0; + if (repo->submodule_prefix) { strbuf_addstr(&name, repo->submodule_prefix); name_base_len = name.len; @@ -890,19 +890,15 @@ static int pattern_callback(const struct option *opt, const char *arg, int cmd_grep(int argc, const char **argv, const char *prefix) { - int hit = 0; + int hit = 0, seen_dashdash = 0, use_index = 1; int cached = 0, untracked = 0, opt_exclude = -1; - int seen_dashdash = 0; int external_grep_allowed__ignored; + int i, dummy, allow_revs; const char *show_in_pager = NULL, *default_pager = "dummy"; struct grep_opt opt; struct object_array list = OBJECT_ARRAY_INIT; struct pathspec pathspec; struct string_list path_list = STRING_LIST_INIT_DUP; - int i; - int dummy; - int use_index = 1; - int allow_revs; struct option options[] = { OPT_BOOL(0, "cached", &cached, @@ -1059,9 +1055,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) recurse_submodules = 0; /* - * skip a -- separator; we know it cannot be - * separating revisions from pathnames if - * we haven't even had any patterns yet + * skip a -- separator; we know it cannot be separating revisions + * from pathnames if we haven't even had any patterns yet */ if (argc > 0 && !opt.pattern_list && !strcmp(argv[0], "--")) { argv++; From patchwork Sun Mar 24 17:51:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragan Simic X-Patchwork-Id: 13600878 Received: from mail.manjaro.org (mail.manjaro.org [116.203.91.91]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50274199DC for ; Sun, 24 Mar 2024 17:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.91.91 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302688; cv=none; b=JaFm9mKBV0pTNLMWbCDpkhEiAsENr+lxQZZRbjQ6B0NcE7tfVaXxRXhstVIXfUSqrRnuqsvgdf8PNsdYon1F+RFA5uWJbcmezLoTtoavuIpDi1/AyEd5bCcdWcDmH0VzzFbJSBlyT9vS2HCB/ganJpI1WNMnVWD1aNCkDa2DvYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302688; c=relaxed/simple; bh=diRCxvnw15jmv/h4aepmIdgdcQIdvjAmL01FBXWR/uM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SZ1G+bDv35nwvDnPZLNDfq21AdG+zmLFmguMtOCR3sFOtF/dKsWlaV5sZ9OZW8VLxj+if88iIw5C07pQnjQJX6/3sqrkQ/p1QPxuKyWOsWIwXQBcCSYElK7g5Bsj94oG4tfINpQcEzcPyvbIDQQhCt2Kzh4P4UyWRWrmF+kcPDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org; spf=pass smtp.mailfrom=manjaro.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b=nlWBf7Qt; arc=none smtp.client-ip=116.203.91.91 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=manjaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b="nlWBf7Qt" From: Dragan Simic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=manjaro.org; s=2021; t=1711302676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jHdvZ0KY+fEfQ9drFiQjJlbGj33a3BhftpMz28RJyAE=; b=nlWBf7QtEfcshm/YVCQp61rbWlrS7EwPgnFXt7F6pUDpUA9+FYj3Xjn9Jv0Vwmvwb87RN/ +28W94JCmXMtvG4lSxDyI1EK826j7HhrjDKcM9mOs8rYSvX2NgMMiXvOV6O4M2uyIYop7T DyA+KYhXxMXaFQUmBnLg+rexo1l8B70ndGe/H2zKUAUUbdY2NLMTgNjbxMZQU9+qBTqWNL T3zlNMUPiJ1E1yjCLi7AynmhcYq6DuADa1jd4VyBhw01P35T5S5TDwDpXHAoQa5kYtC2WD /EOpAdypBVjHSWiTxsX0yqPBEgZZ/nNM3tn/cKYiirnhR3Gt6bGB9tG944Tslg== To: git@vger.kernel.org Cc: gitster@pobox.com, sunshine@sunshineco.com, jn.avila@free.fr Subject: [PATCH v2 2/3] grep docs: describe --recurse-submodules further and improve formatting a bit Date: Sun, 24 Mar 2024 18:51:12 +0100 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: ORIGINATING; auth=pass smtp.auth=dsimic@manjaro.org smtp.mailfrom=dsimic@manjaro.org Clarify that --recurse-submodules cannot be used together with --untracked, and improve the formatting in a couple of places, to make it visually clear that those are the commands or the names of configuration options. While there, change a couple of "" placeholders to "__", to help with an ongoing translation improvement effort. [1] [1] https://lore.kernel.org/git/CAPig+cQc8W4JOpB+TMP=czketU1U7wcY_x9bsP5T=3-XjGLhRQ@mail.gmail.com/ Signed-off-by: Dragan Simic --- Notes: Changes in v2: - No changes were introduced This patch is salvaged from my earlier series, [2] for which it has been concluded to be not acceptable for merging, because of possible issues with various git scripts. [3] Compared to the version in the earlier series, this version adds some more small formatting improvements of the same kind, and also changes a couple of "" placeholders to "__", as suggested by Eric Sunshine. [1] [2] https://lore.kernel.org/git/cover.1710781235.git.dsimic@manjaro.org/T/#u [3] https://lore.kernel.org/git/d8475579f014a90b27efaf6207bc6fb0@manjaro.org/ Documentation/config/grep.txt | 2 +- Documentation/git-grep.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt index e521f20390ce..10041f27b0c8 100644 --- a/Documentation/config/grep.txt +++ b/Documentation/config/grep.txt @@ -24,5 +24,5 @@ grep.fullName:: If set to true, enable `--full-name` option by default. grep.fallbackToNoIndex:: - If set to true, fall back to git grep --no-index if git grep + If set to true, fall back to `git grep --no-index` if `git grep` is executed outside of a git repository. Defaults to false. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 0d0103c780af..f64f40e9775a 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -64,9 +64,9 @@ OPTIONS --recurse-submodules:: Recursively search in each submodule that is active and checked out in the repository. When used in combination with the - option the prefix of all submodule output will be the name of - the parent project's object. This option has no effect - if `--no-index` is given. + __ option the prefix of all submodule output will be the name of + the parent project's __ object. This option cannot be used together + with `--untracked`, and it has no effect if `--no-index` is specified. -a:: --text:: @@ -178,7 +178,7 @@ providing this option will cause it to die. Use \0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with "unusual" characters are quoted as explained for the configuration - variable core.quotePath (see linkgit:git-config[1]). + variable `core.quotePath` (see linkgit:git-config[1]). -o:: --only-matching:: @@ -332,7 +332,7 @@ EXAMPLES NOTES ON THREADS ---------------- -The `--threads` option (and the grep.threads configuration) will be ignored when +The `--threads` option (and the `grep.threads` configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution. When grepping the object store (with `--cached` or giving tree objects), running From patchwork Sun Mar 24 17:51:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dragan Simic X-Patchwork-Id: 13600876 Received: from mail.manjaro.org (mail.manjaro.org [116.203.91.91]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DC48199BE for ; Sun, 24 Mar 2024 17:51:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.91.91 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302687; cv=none; b=gAhLfpfFggvWTIVhxBdB1b8Hg5PGtDRKLD3E/szlkSRHiny4/hRVsB9+2/Z71hEC8UUIcSKxYc5/FYug64Lnw4MAyrvZl+W4WDTdFEGFBbCvcYqmztV3vR3LiR8n/gx2gMY6uhcXSObQdMNp+K5LahWvbSOMZ5keMOac1XoEVOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711302687; c=relaxed/simple; bh=fHmDQyDVFmAdh8dw1uYO2BTvrNjArqWh+H/DoDy+VBQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r8CSnS+3f+nHsBd1d+9TB78T4SYFpLV/20k6WyciWuiSUgtw2j3wSKDU58zpAbQLOoMgnsaMxYwpfWGVK+C/ZC7IO/8Om+kE++i8SiyyIy6ISfZftHmrJIshKpMuVf4+a3X3W5OW5Na8N2+B5obql2ISt2Cx4oDPs5yx8INO3zI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org; spf=pass smtp.mailfrom=manjaro.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b=kc4kUGH9; arc=none smtp.client-ip=116.203.91.91 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=manjaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=manjaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=manjaro.org header.i=@manjaro.org header.b="kc4kUGH9" From: Dragan Simic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=manjaro.org; s=2021; t=1711302677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S2tGyfxM1KFr+vX5lY4uc7WwjnKKHtKtpzgBkY3n0u4=; b=kc4kUGH9w5mGZ+iHDCl2VJk/191geLIrotOUksOT+OZwamLMomNkp7eh3ze/wx/O/SyIzh 7a+4qe7QPVebUelpc3DnA3fDgc/bnX5b7M//KHvdw2sP910ygO5Sr0Ad35XGLd2QQYDzht igXaTPe39+KU93se4dbcr8wDFdxzUN4ugvrxa07yhCoHO62K7MWzzVY+agkSEg8OCvkzut D7CMDBXUSHlrEBGni3CpHOIjQeLh7dCiiUR5vVKH8TJu9rHnsfSCm4ZZt4/t/S8Urh5Wkb pEWpAo7neDaKQ16M+G+iAw1oRAM8hePg5RxkFA55DWj7YeR5B0wRJ6KnP1IRHw== To: git@vger.kernel.org Cc: gitster@pobox.com, sunshine@sunshineco.com, jn.avila@free.fr Subject: [PATCH v2 3/3] grep docs: describe --no-index further and improve formatting a bit Date: Sun, 24 Mar 2024 18:51:13 +0100 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: ORIGINATING; auth=pass smtp.auth=dsimic@manjaro.org smtp.mailfrom=dsimic@manjaro.org Improve the description of --no-index, to make it more clear to the users what this option actually does under the hood, and what's its purpose. Describe the dependency between --no-index and either of the --cached and --untracked options, which cannot be used together. As part of that, shuffle a couple of the options, to make the documentation flow a bit better, because it makes more sense to describe first the options that have something in common, and to after that describe an option that does something differently. In more detail, --cached and --untracked both leave git-grep(1) in the usual state, in which it treats the directory as a local git repository, unlike --no-index that makes git-grep(1) treat the directory not as a git repository. While there, improve the descriptions of grep worker threads a bit, to give them better context. Adjust the language a bit, to avoid addressing the reader directly, which is in general preferred in technical documentation, because it eliminates the possible element of persuading the user to do something. In other words, we should be telling the user what our software can do, instead of telling the user what to do. Also perform some minor formatting improvements, to make it clear it's the git commands, command parameters, and configuration option names. Signed-off-by: Dragan Simic --- Notes: Changes in v2: - Improved the patch description a bit, to make it more clear why this patch shuffles some of the options around, and why it changes some of the wording to passive voice - Reworded the description of --no-index a bit, to not mention the name of the utility we're describing, which avoids any possible confusion, as pointed out by Jean-Noel Avila [1] This patch is salvaged from my earlier series, [2] for which it has been concluded to be not acceptable for merging, because of possible issues with various git scripts. [3] Compared to the version in the earlier series, this version continues the effort to improve the description of --no-index, by also incorporating the possible improvements pointed out by Junio. [4] This version also improves the wording of some related descriptions, mainly related to grep.threads, and performs some additional small formatting improvements. [1] https://lore.kernel.org/git/ed050f2d496a6db07e698fd2f1094b81@manjaro.org/ [2] https://lore.kernel.org/git/cover.1710781235.git.dsimic@manjaro.org/T/#u [3] https://lore.kernel.org/git/d8475579f014a90b27efaf6207bc6fb0@manjaro.org/ [4] https://lore.kernel.org/git/xmqqwmpzrqfv.fsf@gitster.g/ Documentation/git-grep.txt | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index f64f40e9775a..bfa87ba22ed5 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -28,7 +28,7 @@ SYNOPSIS [-f ] [-e] [--and|--or|--not|(|)|-e ...] [--recurse-submodules] [--parent-basename ] - [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | ...] + [ [--[no-]exclude-standard] [--cached | --untracked | --no-index] | ...] [--] [...] DESCRIPTION @@ -45,13 +45,20 @@ OPTIONS Instead of searching tracked files in the working tree, search blobs registered in the index file. ---no-index:: - Search files in the current directory that is not managed by Git. - --untracked:: In addition to searching in the tracked files in the working tree, search also in untracked files. +--no-index:: + Search files in the current directory that is not managed by Git, + or by ignoring that the current directory is managed by Git. This + is rather similar to running the regular `grep(1)` utility with its + `-r` option specified, but with some additional benefits, such as + using multiple worker threads to speed up searches. ++ +This option cannot be used together with `--cached` or `--untracked`. +See also `grep.fallbackToNoIndex` in 'CONFIGURATION' below. + --no-exclude-standard:: Also search in ignored files by not honoring the `.gitignore` mechanism. Only useful with `--untracked`. @@ -248,8 +255,9 @@ providing this option will cause it to die. a non-zero status. --threads :: - Number of grep worker threads to use. - See `grep.threads` in 'CONFIGURATION' for more information. + Number of `grep` worker threads to use, to speed up searches. + See 'NOTES ON THREADS' and `grep.threads` in 'CONFIGURATION' + for more information. -f :: Read patterns from , one per line. @@ -336,9 +344,9 @@ The `--threads` option (and the `grep.threads` configuration) will be ignored wh `--open-files-in-pager` is used, forcing a single-threaded execution. When grepping the object store (with `--cached` or giving tree objects), running -with multiple threads might perform slower than single threaded if `--textconv` -is given and there are too many text conversions. So if you experience low -performance in this case, it might be desirable to use `--threads=1`. +with multiple threads might perform slower than single-threaded if `--textconv` +is given and there are too many text conversions. Thus, if low performance is +experienced in this case, it might be desirable to use `--threads=1`. CONFIGURATION -------------