From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Martin Ågren" <martin.agren@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 00/11] Remove the_index, the final part
Date: Sat, 12 Jan 2019 09:13:21 +0700 [thread overview]
Message-ID: <20190112021332.11066-1-pclouds@gmail.com> (raw)
In-Reply-To: <20190105055153.3256-1-pclouds@gmail.com>
v2 fixes Martin's comment in 2/10 and also includes a new patch about
grep_opt->repo that was sent and reviewed during rc time [1]. It's kind
of the same topic so I include it here instead of resending it
separately.
[1] https://public-inbox.org/git/20181118163851.32178-1-pclouds@gmail.com/
Range-diff:
-: ---------- > 1: 2e43d9479e grep: use grep_opt->repo instead of explict repo argument
1: 5e2b073fcc = 2: f6eeeba0e7 notes-utils.c: remove the_repository references
2: 7055e1e351 ! 3: 1fca26dc83 repository.c: replace hold_locked_index() with repo_hold_locked_index()
@@ -23,18 +23,6 @@
if (state->check_index && read_apply_cache(state) < 0) {
- diff --git a/builtin/clone.c b/builtin/clone.c
- --- a/builtin/clone.c
- +++ b/builtin/clone.c
-@@
- * Clone a repository into a different directory that does not yet exist.
- */
-
-+#define USE_THE_INDEX_COMPATIBILITY_MACROS
- #include "builtin.h"
- #include "config.h"
- #include "lockfile.h"
-
diff --git a/cache.h b/cache.h
--- a/cache.h
+++ b/cache.h
@@ -117,6 +105,8 @@
+ struct lock_file *lf,
+ int flags)
+{
++ if (!repo->index_file)
++ BUG("the repo hasn't been setup");
+ return hold_lock_file_for_update(lf, repo->index_file, flags);
+}
3: 86d6231d9e = 4: 4f63b505d7 checkout: avoid the_index when possible
4: 50b7828c17 = 5: be722abc06 read-cache.c: kill read_index()
5: 6cf6d66b97 = 6: a86921c6b6 read-cache.c: replace update_index_if_able with repo_&
6: a5b19aac6d = 7: 637289c4ff sha1-name.c: remove implicit dependency on the_index
7: f9660a561e = 8: f7fc854a43 merge-recursive.c: remove implicit dependency on the_index
8: be609ede73 = 9: c1b37119a7 merge-recursive.c: remove implicit dependency on the_repository
9: 639062ad41 = 10: 315f3f37d6 read-cache.c: remove the_* from index_has_changes()
10: b41cebabad ! 11: c271d734aa cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
@@ -119,6 +119,18 @@
#include "cache.h"
#include "config.h"
+ diff --git a/builtin/clone.c b/builtin/clone.c
+ --- a/builtin/clone.c
+ +++ b/builtin/clone.c
+@@
+ * Clone a repository into a different directory that does not yet exist.
+ */
+
++#define USE_THE_INDEX_COMPATIBILITY_MACROS
+ #include "builtin.h"
+ #include "config.h"
+ #include "lockfile.h"
+
diff --git a/builtin/commit.c b/builtin/commit.c
--- a/builtin/commit.c
+++ b/builtin/commit.c
Nguyễn Thái Ngọc Duy (11):
grep: use grep_opt->repo instead of explict repo argument
notes-utils.c: remove the_repository references
repository.c: replace hold_locked_index() with
repo_hold_locked_index()
checkout: avoid the_index when possible
read-cache.c: kill read_index()
read-cache.c: replace update_index_if_able with repo_&
sha1-name.c: remove implicit dependency on the_index
merge-recursive.c: remove implicit dependency on the_index
merge-recursive.c: remove implicit dependency on the_repository
read-cache.c: remove the_* from index_has_changes()
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
apply.c | 5 +-
attr.c | 1 -
blame.c | 4 +-
builtin/add.c | 1 +
builtin/am.c | 13 +-
builtin/blame.c | 3 +-
builtin/cat-file.c | 7 +-
builtin/check-attr.c | 1 +
builtin/check-ignore.c | 1 +
builtin/checkout-index.c | 1 +
builtin/checkout.c | 5 +-
builtin/clean.c | 1 +
builtin/clone.c | 1 +
builtin/commit.c | 7 +-
builtin/describe.c | 3 +-
builtin/diff-files.c | 1 +
builtin/diff-index.c | 1 +
builtin/diff-tree.c | 3 +-
builtin/diff.c | 3 +-
builtin/difftool.c | 1 +
builtin/fsck.c | 1 +
builtin/grep.c | 45 ++++---
builtin/hash-object.c | 3 +-
builtin/log.c | 4 +-
builtin/ls-files.c | 1 -
builtin/merge-index.c | 1 +
builtin/merge-ours.c | 1 +
builtin/merge-recursive.c | 2 +-
builtin/merge-tree.c | 4 +-
builtin/merge.c | 3 +-
builtin/mv.c | 1 +
builtin/notes.c | 21 +--
builtin/pack-objects.c | 2 +-
builtin/pull.c | 1 +
builtin/read-tree.c | 1 +
builtin/rebase--interactive.c | 1 +
builtin/rebase.c | 14 +-
builtin/replace.c | 2 +-
builtin/reset.c | 1 +
builtin/rev-parse.c | 4 +-
builtin/rm.c | 1 +
builtin/submodule--helper.c | 1 +
builtin/update-index.c | 1 +
builtin/write-tree.c | 1 +
cache-tree.h | 2 +-
cache.h | 35 ++---
convert.c | 1 -
dir.c | 1 -
git.c | 4 +-
list-objects-filter-options.c | 2 +-
merge-recursive.c | 191 +++++++++++++++------------
merge-recursive.h | 6 +-
merge.c | 4 +-
name-hash.c | 1 -
notes-merge.c | 4 +-
notes-utils.c | 17 ++-
notes-utils.h | 11 +-
pathspec.c | 1 -
preload-index.c | 11 +-
read-cache.c | 44 +++---
repository.c | 11 ++
repository.h | 16 +++
rerere.c | 8 +-
revision.c | 12 +-
sequencer.c | 41 +++---
sequencer.h | 3 +-
sha1-name.c | 56 ++++----
submodule.c | 1 -
t/helper/test-dump-fsmonitor.c | 4 +-
t/helper/test-dump-untracked-cache.c | 1 +
t/helper/test-tool.h | 1 +
tree.c | 1 -
unpack-trees.c | 1 -
wt-status.c | 4 +-
74 files changed, 385 insertions(+), 290 deletions(-)
--
2.20.0.482.g66447595a7
next prev parent reply other threads:[~2019-01-12 2:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-05 5:51 [PATCH 00/10] Remove the_index, the final part Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 01/10] notes-utils.c: remove the_repository references Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 02/10] repository.c: replace hold_locked_index() with repo_hold_locked_index() Nguyễn Thái Ngọc Duy
2019-01-05 14:33 ` Martin Ågren
2019-01-07 12:55 ` Duy Nguyen
2019-01-05 5:51 ` [PATCH 03/10] checkout: avoid the_index when possible Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 04/10] read-cache.c: kill read_index() Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 05/10] read-cache.c: replace update_index_if_able with repo_& Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 06/10] sha1-name.c: remove implicit dependency on the_index Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 07/10] merge-recursive.c: " Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 08/10] merge-recursive.c: remove implicit dependency on the_repository Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 09/10] read-cache.c: remove the_* from index_has_changes() Nguyễn Thái Ngọc Duy
2019-01-05 5:51 ` [PATCH 10/10] cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` Nguyễn Thái Ngọc Duy [this message]
2019-01-12 2:13 ` [PATCH v2 01/11] grep: use grep_opt->repo instead of explict repo argument Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 02/11] notes-utils.c: remove the_repository references Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 03/11] repository.c: replace hold_locked_index() with repo_hold_locked_index() Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 04/11] checkout: avoid the_index when possible Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 05/11] read-cache.c: kill read_index() Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 06/11] read-cache.c: replace update_index_if_able with repo_& Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 07/11] sha1-name.c: remove implicit dependency on the_index Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 08/11] merge-recursive.c: " Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 09/11] merge-recursive.c: remove implicit dependency on the_repository Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 10/11] read-cache.c: remove the_* from index_has_changes() Nguyễn Thái Ngọc Duy
2019-01-12 2:13 ` [PATCH v2 11/11] cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch Nguyễn Thái Ngọc Duy
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=20190112021332.11066-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@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).