From: "Chinmoy via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <stolee@gmail.com>, Chinmoy <chinmoy12c@gmail.com>,
Chinmoy Chakraborty <chinmoy12c@gmail.com>
Subject: [PATCH v4] cache-tree.c: remove implicit dependency on the_repository
Date: Wed, 07 Apr 2021 06:54:49 +0000 [thread overview]
Message-ID: <pull.915.v4.git.1617778489719.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.915.v3.git.1617465421353.gitgitgadget@gmail.com>
From: Chinmoy Chakraborty <chinmoy12c@gmail.com>
This kills the_repository dependency in cache_tree_update()
and prime_cache_tree().
Signed-off-by: Chinmoy Chakraborty <chinmoy12c@gmail.com>
---
Replace the_repository with r
There are multiple files that try to reference the repository and
the_index directly. To follow a more object-oriented convention these
references should be replaced with r and index and passed through
functions.
Signed-off-by: Chinmoy Chakraborty chinmoy12c@gmail.com
Related issue
=============
#379
cc: Derrick Stolee stolee@gmail.com
Changes since v3
================
* Used istate->repo instead of the_repository to prevent making changes
in callers of the function.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-915%2Fchinmoy12c%2Fissue_379-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-915/chinmoy12c/issue_379-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/915
Range-diff vs v3:
1: 2a4fad2781e3 < -: ------------ cache-tree.c: remove implicit dependency on the_repository
-: ------------ > 1: 25f09954b9df cache-tree.c: remove implicit dependency on the_repository
cache-tree.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index add1f0771317..4928a9f0f13b 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -446,10 +446,10 @@ int cache_tree_update(struct index_state *istate, int flags)
istate->cache_tree = cache_tree();
trace_performance_enter();
- trace2_region_enter("cache_tree", "update", the_repository);
+ trace2_region_enter("cache_tree", "update", istate->repo);
i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
"", 0, &skip, flags);
- trace2_region_leave("cache_tree", "update", the_repository);
+ trace2_region_leave("cache_tree", "update", istate->repo);
trace_performance_leave("cache_tree_update");
if (i < 0)
return i;
@@ -746,13 +746,13 @@ void prime_cache_tree(struct repository *r,
struct index_state *istate,
struct tree *tree)
{
- trace2_region_enter("cache-tree", "prime_cache_tree", the_repository);
+ trace2_region_enter("cache-tree", "prime_cache_tree", r);
cache_tree_free(&istate->cache_tree);
istate->cache_tree = cache_tree();
prime_cache_tree_rec(r, istate->cache_tree, tree);
istate->cache_changed |= CACHE_TREE_CHANGED;
- trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);
+ trace2_region_leave("cache-tree", "prime_cache_tree", r);
}
/*
base-commit: 2e36527f23b7f6ae15e6f21ac3b08bf3fed6ee48
--
gitgitgadget
next prev parent reply other threads:[~2021-04-07 6:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 19:48 [PATCH] cache-tree.c: remove implicit dependency on the_repository Chinmoy via GitGitGadget
2021-03-25 20:31 ` Derrick Stolee
2021-03-26 6:49 ` Chinmoy Chakraborty
2021-03-26 7:54 ` Chinmoy Chakraborty
2021-03-26 15:35 ` [PATCH v2] " Chinmoy via GitGitGadget
2021-04-03 15:57 ` [PATCH v3] " Chinmoy via GitGitGadget
2021-04-04 1:49 ` Junio C Hamano
2021-04-04 5:11 ` Chinmoy Chakraborty
2021-04-04 5:36 ` Junio C Hamano
2021-04-04 5:18 ` Chinmoy Chakraborty
2021-04-04 6:09 ` Junio C Hamano
2021-04-05 13:08 ` Derrick Stolee
2021-04-05 17:48 ` Junio C Hamano
2021-04-07 6:54 ` Chinmoy via GitGitGadget [this message]
2021-04-07 23:03 ` [PATCH v4] " Junio C Hamano
2021-04-08 3:56 ` Chinmoy Chakraborty
2021-04-08 13:23 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.915.v4.git.1617778489719.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=chinmoy12c@gmail.com \
--cc=git@vger.kernel.org \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).