From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com,
Derrick Stolee <stolee@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH v2 0/6] Kill the_repository in tree-walk.c
Date: Thu, 27 Jun 2019 16:28:46 +0700 [thread overview]
Message-ID: <20190627092852.11326-1-pclouds@gmail.com> (raw)
In-Reply-To: <20190624095533.22162-1-pclouds@gmail.com>
v2 fixes t7814 flakiness. The problem is git-grep can operate on
multiple repos and I read objects from the wrong repo (supermodule)
instead of the submodule one.
There are still the_repository hidden in git-grep code paths, and the
hack of asborbing submodule's object db to the_repo's in order to make
it work. And I can't quite understand how t7814 sometimes passed.
I'll revisit this after this series is done and will try to get rid of
add_to_alternates_memory() in git-grep.
Nguyễn Thái Ngọc Duy (6):
sha1-file.c: remove the_repo from read_object_with_reference()
tree-walk.c: remove the_repo from fill_tree_descriptor()
tree-walk.c: remove the_repo from get_tree_entry()
tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
match-trees.c: remove the_repo from shift_tree*()
Use the right 'struct repository' instead of the_repository
archive.c | 4 +++-
blame.c | 4 ++--
builtin/cat-file.c | 3 ++-
builtin/grep.c | 6 ++++--
builtin/merge-tree.c | 22 +++++++++++--------
builtin/pack-objects.c | 3 ++-
builtin/rebase.c | 4 ++--
builtin/reset.c | 4 ++--
builtin/rm.c | 2 +-
builtin/update-index.c | 2 +-
cache.h | 7 +++---
fast-import.c | 9 +++++---
line-log.c | 7 +++---
match-trees.c | 12 ++++++-----
merge-recursive.c | 43 +++++++++++++++++++++----------------
notes.c | 4 ++--
sequencer.c | 6 +++---
sha1-file.c | 5 +++--
sha1-name.c | 25 +++++++--------------
shallow.c | 3 ++-
t/helper/test-match-trees.c | 2 +-
tree-diff.c | 4 ++--
tree-walk.c | 35 ++++++++++++++++++++----------
tree-walk.h | 8 ++++---
unpack-trees.c | 2 +-
25 files changed, 129 insertions(+), 97 deletions(-)
Range-diff dựa trên v1:
1: 35d7cdbe6a ! 1: 9e73c39f9a sha1-file.c: remove the_repo from read_object_with_reference()
@@ -3,7 +3,6 @@
sha1-file.c: remove the_repo from read_object_with_reference()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
--- a/builtin/cat-file.c
@@ -27,7 +26,7 @@
grep_read_lock();
- data = read_object_with_reference(&object->oid, tree_type,
-+ data = read_object_with_reference(opt->repo,
++ data = read_object_with_reference(&subrepo,
+ &object->oid, tree_type,
&size, NULL);
grep_read_unlock();
2: 4ff146fb64 = 2: b9107f7503 tree-walk.c: remove the_repo from fill_tree_descriptor()
3: 47f956bd0f = 3: 87ed67bde5 tree-walk.c: remove the_repo from get_tree_entry()
4: e19c4b9ce6 = 4: 557b61f2ba tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
5: 3fe87a7fde = 5: 53f09e0437 match-trees.c: remove the_repo from shift_tree*()
6: 6d0449f1a7 = 6: d5d4d2ba65 Use the right 'struct repository' instead of the_repository
--
2.22.0.rc0.322.g2b0371e29a
next prev parent reply other threads:[~2019-06-27 9:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 9:55 [PATCH 0/6] Kill the_repository in tree-walk.c Nguyễn Thái Ngọc Duy
2019-06-24 9:55 ` [PATCH 1/6] sha1-file.c: remove the_repo from read_object_with_reference() Nguyễn Thái Ngọc Duy
2019-06-27 12:54 ` Johannes Schindelin
2019-06-27 13:12 ` Duy Nguyen
2019-06-24 9:55 ` [PATCH 2/6] tree-walk.c: remove the_repo from fill_tree_descriptor() Nguyễn Thái Ngọc Duy
2019-06-24 13:30 ` Derrick Stolee
2019-06-26 16:27 ` Junio C Hamano
2019-06-26 16:47 ` Derrick Stolee
2019-06-24 9:55 ` [PATCH 3/6] tree-walk.c: remove the_repo from get_tree_entry() Nguyễn Thái Ngọc Duy
2019-06-24 14:20 ` Derrick Stolee
2019-06-24 14:55 ` Duy Nguyen
2019-06-24 9:55 ` [PATCH 4/6] tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() Nguyễn Thái Ngọc Duy
2019-06-24 9:55 ` [PATCH 5/6] match-trees.c: remove the_repo from shift_tree*() Nguyễn Thái Ngọc Duy
2019-06-24 9:55 ` [PATCH 6/6] Use the right 'struct repository' instead of the_repository Nguyễn Thái Ngọc Duy
2019-06-24 14:24 ` Derrick Stolee
2019-06-24 14:45 ` Duy Nguyen
2019-06-27 9:06 ` Johannes Schindelin
2019-06-26 17:20 ` [PATCH 0/6] Kill the_repository in tree-walk.c Junio C Hamano
2019-06-27 13:04 ` Johannes Schindelin
2019-06-27 17:09 ` Derrick Stolee
2019-06-27 9:28 ` Nguyễn Thái Ngọc Duy [this message]
2019-06-27 9:28 ` [PATCH v2 1/6] sha1-file.c: remove the_repo from read_object_with_reference() Nguyễn Thái Ngọc Duy
2019-06-28 12:46 ` Johannes Schindelin
2019-06-27 9:28 ` [PATCH v2 2/6] tree-walk.c: remove the_repo from fill_tree_descriptor() Nguyễn Thái Ngọc Duy
2019-06-27 9:28 ` [PATCH v2 3/6] tree-walk.c: remove the_repo from get_tree_entry() Nguyễn Thái Ngọc Duy
2019-06-27 9:28 ` [PATCH v2 4/6] tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() Nguyễn Thái Ngọc Duy
2019-06-27 9:28 ` [PATCH v2 5/6] match-trees.c: remove the_repo from shift_tree*() Nguyễn Thái Ngọc Duy
2019-06-27 9:28 ` [PATCH v2 6/6] Use the right 'struct repository' instead of the_repository Nguyễn Thái Ngọc Duy
2019-06-27 19:44 ` [PATCH v2 0/6] Kill the_repository in tree-walk.c Junio C Hamano
2019-06-28 9:35 ` [PATCH v2 7/6] t7814: do not generate same commits in different repos Nguyễn Thái Ngọc Duy
2019-06-28 16:17 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190627092852.11326-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).