Skip to content

Kill the_index part 5

Nguyễn Thái Ngọc Duy git 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest22 patches 1 replyIn review
  2. v13 of 22 patches 0 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22wt-status.c: remove implicit dependency on the_indexbuiltin/commit.c builtin/pull.c builtin/rebase.c +3 more+66 -470 replies
2/22wt-status.c: remove implicit dependency the_repositoryref-filter.c wt-status.c wt-status.h+14 -100 replies
3/22list-objects-filter.c: remove implicit dependency on the_indexlist-objects-filter.c list-objects-filter.h list-objects.c+15 -60 replies
4/22list-objects.c: reduce the_repository referenceslist-objects.c+2 -20 replies
5/22notes-merge.c: remove implicit dependency on the_indexbuiltin/notes.c notes-merge.c notes-merge.h+12 -70 replies
6/22notes-merge.c: remove implicit dependency the_repositorynotes-merge.c+2 -20 replies
7/22transport.c: remove implicit dependency on the_indexbuiltin/push.c transport.c transport.h+8 -50 replies
8/22sequencer.c: remove implicit dependency on the_indexbuiltin/commit.c builtin/merge.c builtin/rebase--interactive.c +3 more+197 -1520 replies
9/22sequencer.c: remove implicit dependency on the_repositorybuiltin/rebase--interactive.c builtin/revert.c rebase-interactive.c +2 more+86 -770 replies
10/22blame.c: remove implicit dependency the_repositoryblame.c+22 -170 replies
11/22bisect.c: remove the_repository referencebisect.c bisect.h builtin/bisect--helper.c+33 -220 replies
12/22branch.c: remove the_repository referencebranch.c branch.h builtin/am.c +4 more+27 -190 replies
13/22bundle.c: remove the_repository referencesbuiltin/bundle.c bundle.c bundle.h +1 more+24 -200 replies
14/22cache-tree.c: remove the_repository referencesbuiltin/read-tree.c builtin/rebase.c builtin/reset.c +5 more+25 -190 replies
15/22delta-islands.c: remove the_repository referencesbuiltin/pack-objects.c delta-islands.c delta-islands.h+22 -150 replies
16/22diff-lib.c: remove the_repository referencesbuiltin/commit.c builtin/merge-ours.c diff-lib.c +2 more+11 -80 replies
17/22line-log.c: remove the_repository referenceline-log.c+1 -10 replies
18/22notes-cache.c: remove the_repository referencescombine-diff.c diff.c diff.h +6 more+28 -210 replies
19/22pack-check.c: remove the_repository referencesbuiltin/fsck.c pack-check.c pack.h+10 -60 replies
20/22pack-*.c: remove the_repository referencesbuiltin/pack-objects.c pack-bitmap-write.c pack-bitmap.c +3 more+21 -140 replies
21/22rerere.c: remove the_repository referencesbuiltin/am.c builtin/rebase--interactive.c builtin/rebase.c +3 more+26 -240 replies
22/22rebase-interactive.c: remove the_repository referencesbuiltin/rebase--interactive.c rebase-interactive.c rebase-interactive.h+8 -50 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/22] Kill the_index part 5

(Please ignore v1 which contains unrelated patches)

I lied about part 5 being final. This series contains most of my WIP series [2] except sha1-name.c, read-cache.c and merge-recursive.c because there will be conflicts on 'pu' so they will be in part 6. At least this only results in two small conflicts in sequencer.c.

I did start pushing the_repository out of library code [1] in the bottom half of this series. There aren't big surprises except that cache-tree API now take _both_ struct repository and struct index_state. The reason is cache-tree can work on temporary indexes and repo->index is about $GIT_DIR/index.

[1] Stefan and I make a good team. He keeps adding the_repository. I keep removing. We both hold hands leading commit counts (with Brian just a bit behind frantically replacing sha1 with oid to keep up). Meanwhile Junio is crying in the corner because of too many conflicts. :-D

[2] https://public-inbox.org/git/[email protected]/

Nguyễn Thái Ngọc Duy (22):
wt-status.c: remove implicit dependency on the_index wt-status.c: remove implicit dependency the_repository list-objects-filter.c: remove implicit dependency on the_index list-objects.c: reduce the_repository references notes-merge.c: remove implicit dependency on the_index notes-merge.c: remove implicit dependency the_repository transport.c: remove implicit dependency on the_index sequencer.c: remove implicit dependency on the_index sequencer.c: remove implicit dependency on the_repository blame.c: remove implicit dependency the_repository bisect.c: remove the_repository reference
branch.c: remove the_repository reference
bundle.c: remove the_repository references cache-tree.c: remove the_repository references delta-islands.c: remove the_repository references diff-lib.c: remove the_repository references line-log.c: remove the_repository reference notes-cache.c: remove the_repository references pack-check.c: remove the_repository references pack-*.c: remove the_repository references
rerere.c: remove the_repository references rebase-interactive.c: remove the_repository references

 bisect.c                      |  48 ++--
 bisect.h                      |   5 +-
 blame.c                       |  39 +--
 branch.c                      |  21 +-
 branch.h                      |   8 +-
 builtin/am.c                  |   4 +-
 builtin/bisect--helper.c      |   2 +-
 builtin/branch.c              |   6 +-
 builtin/bundle.c              |   7 +-
 builtin/checkout.c            |   5 +-
 builtin/commit.c              |   8 +-
 builtin/fsck.c                |   3 +-
 builtin/merge-ours.c          |   2 +-
 builtin/merge.c               |   2 +-
 builtin/notes.c               |   2 +-
 builtin/pack-objects.c        |   6 +-
 builtin/pull.c                |   3 +-
 builtin/push.c                |   3 +-
 builtin/read-tree.c           |   4 +-
 builtin/rebase--interactive.c |  19 +-
 builtin/rebase.c              |  13 +-
 builtin/rerere.c              |  10 +-
 builtin/reset.c               |   4 +-
 builtin/revert.c              |   8 +-
 bundle.c                      |  26 +-
 bundle.h                      |   9 +-
 cache-tree.c                  |  26 +-
 cache-tree.h                  |   4 +-
 combine-diff.c                |   2 +-
 delta-islands.c               |  24 +-
 delta-islands.h               |   9 +-
 diff-lib.c                    |   7 +-
 diff.c                        |  12 +-
 diff.h                        |   5 +-
 diffcore-pickaxe.c            |   4 +-
 grep.c                        |   2 +-
 line-log.c                    |   2 +-
 list-objects-filter.c         |  10 +-
 list-objects-filter.h         |   2 +
 list-objects.c                |  13 +-
 notes-cache.c                 |  12 +-
 notes-cache.h                 |   6 +-
 notes-merge.c                 |  16 +-
 notes-merge.h                 |   5 +-
 pack-bitmap-write.c           |   6 +-
 pack-bitmap.c                 |  13 +-
 pack-bitmap.h                 |   3 +-
 pack-check.c                  |   9 +-
 pack-objects.c                |   6 +-
 pack-objects.h                |   5 +-
 pack.h                        |   4 +-
 read-cache.c                  |   2 +-
 rebase-interactive.c          |   6 +-
 rebase-interactive.h          |   5 +-
 ref-filter.c                  |   2 +-
 rerere.c                      |  26 +-
 rerere.h                      |   6 +-
 sequencer.c                   | 453 +++++++++++++++++++---------------
 sequencer.h                   |  27 +-
 transport.c                   |   9 +-
 transport.h                   |   3 +-
 unpack-trees.c                |   2 +-
 userdiff.c                    |   5 +-
 userdiff.h                    |   4 +-
 wt-status.c                   |  94 ++++---
 wt-status.h                   |  21 +-
 66 files changed, 650 insertions(+), 489 deletions(-)
Signature · 1 line
2.19.1.1231.g84aef82467