Kill the_index part 4
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest23 patches 5 repliesIn review
- v423 patches 4 repliesSuperseded
- v323 patches 5 repliesSuperseded
Earlier versions · 2
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v2 | 24 patches | 15 replies | Superseded | |
| v1 | 21 patches | 10 replies | Superseded |
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/23 | archive.c: remove implicit dependency the_repositoryarchive.c | +1 | 0 replies | |
| 2/23 | read-cache.c: remove 'const' from index_has_changes()cache.h read-cache.c | +2 | 0 replies | |
| 3/23 | diff.c: reduce implicit dependency on the_indexbuiltin/ diff.c diff.h +5 more | +161 | 0 replies | |
| 4/23 | combine-diff.c: remove implicit dependency on the_indexcombine-diff.c | +2 | 0 replies | |
| 5/23 | blame.c: rename "repo" argument to "r"blame.c | +18 | 0 replies | |
| 6/23 | diff.c: remove the_index dependency in textconv() functionsblame.c builtin/ builtin/ +5 more | +45 | 0 replies | |
| 7/23 | grep.c: remove implicit dependency on the_indexbuiltin/ builtin/ grep.c +2 more | +18 | 0 replies | |
| 8/23 | diff.c: remove implicit dependency on the_indexDocumentation/ blame.c builtin/ +12 more | +38 | 0 replies | |
| 9/23 | read-cache.c: remove implicit dependency on the_indexread-cache.c | +2 | 0 replies | |
| 10/23 | diff-lib.c: remove implicit dependency on the_indexdiff-lib.c | +10 | 0 replies | |
| 11/23 | ll-merge.c: remove implicit dependency on the_indexapply.c builtin/ diff.c +6 more | +34 | 0 replies | |
| 12/23 | merge-blobs.c: remove implicit dependency on the_indexbuiltin/ merge-blobs.c merge-blobs.h | +17 | 0 replies | |
| 13/23 | merge.c: remove implicit dependency on the_indexbuiltin/ builtin/ cache.h +2 more | +28 | 0 replies | |
| 14/23 | patch-ids.c: remove implicit dependency on the_indexbuiltin/ patch-ids.c patch-ids.h +1 more | +6 | 0 replies | |
| 15/23 | sha1-file.c: remove implicit dependency on the_indexbuiltin/ builtin/ builtin/ +6 more | +61 | 0 replies | |
| 16/23 | rerere.c: remove implicit dependency on the_indexapply.c builtin/ builtin/ +5 more | +81 | 0 replies | |
| 17/23 | userdiff.c: remove implicit dependency on the_indexarchive-zip.c builtin/ combine-diff.c +8 more | +59 | 5 replies | |
| 18/23 | line-range.c: remove implicit dependency on the_indexbuiltin/ line-log.c line-range.c +1 more | +21 | 0 replies | |
| 19/23 | submodule.c: remove implicit dependency on the_indexbuiltin/ submodule.c submodule.h +1 more | +30 | 0 replies | |
| 20/23 | tree-diff.c: remove implicit dependency on the_indextree-diff.c | +1 | 0 replies | |
| 21/23 | ws.c: remove implicit dependency on the_indexapply.c cache.h diff.c +1 more | +11 | 0 replies | |
| 22/23 | revision.c: remove implicit dependency on the_indexDocumentation/ bisect.c builtin/ +34 more | +89 | 0 replies | |
| 23/23 | revision.c: reduce implicit dependency the_repositorylist-objects.c revision.c revision.h | +29 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.
Cover letter [PATCH v5 00/23] Kill the_index part 4
v5 only has commit message update in one patch. range-diff below.
Also, from "What's cooking" today
Quoted 9 lines · Junio C Hamano
* nd/the-index (2018-09-17) 23 commits
...Will merge to 'next'.
As expected, this has close to irritating amount of textual conflicts with the topics in-flight. Hopefully we can minimize the pain by letting it pass through quickly?
No objection. I have to warn Junio though, there is still part 5, so the pain will be still there for a bit longer. Unless the new rebase and stash topics get merged first.
1: 9b907ae529 ! 1: 2203a5fbac read-cache.c: remove 'const' from index_has_changes()
@@ -3,16 +3,19 @@
read-cache.c: remove 'const' from index_has_changes()
This function calls do_diff_cache() which eventually needs to set this
- "istate" to unpack_options->src_index (*). This is an unfortunate fact
- that unpack_trees() _will_ destroy src_index so we can't really pass a
+ "istate" to unpack_options->src_index [1]. This is an unfortunate fact
+ that unpack_trees() _will_ update [2] src_index so we can't really pass a
const index_state there. Just remove 'const'.
- (*) Right now diff_cache() in diff-lib.c assigns the_index to
+ [1] Right now diff_cache() in diff-lib.c assigns the_index to
src_index. But the plan is to get rid of the_index, so it should be 'istate' from here that gets assigned to src_index.
+ [2] Some transient bits in the source index are touched. Optional
+ extensions can also be removed. But other than that the source
+ tree should still be valid.
+
- Signed-off-by: Junio C Hamano <[email protected]>
diff --git a/cache.h b/cache.h
--- a/cache.h
2: 27518df579 = 2: fc60c5dfcf diff.c: reduce implicit dependency on the_index 3: bd45a50b6d = 3: 9bb467ec06 combine-diff.c: remove implicit dependency on the_index 4: 90ac73d37b = 4: 4304405578 blame.c: rename "repo" argument to "r" 5: c36071a4ab = 5: 71c1bb997e diff.c: remove the_index dependency in textconv() functions 6: 9321bb37a9 = 6: 0c9371ebd6 grep.c: remove implicit dependency on the_index 7: 41b046463c = 7: e6aba3aad9 diff.c: remove implicit dependency on the_index 8: f0d1e5da57 = 8: 8e4c25023f read-cache.c: remove implicit dependency on the_index 9: 3b7c181005 = 9: f605feb11e diff-lib.c: remove implicit dependency on the_index 10: 0f2ed0b54d = 10: fb06c902e2 ll-merge.c: remove implicit dependency on the_index 11: 46d37956a5 = 11: 5a75125df6 merge-blobs.c: remove implicit dependency on the_index 12: 8b7e116fba = 12: c13cd5443d merge.c: remove implicit dependency on the_index 13: 7d5bd2dfbd = 13: 575aea07ed patch-ids.c: remove implicit dependency on the_index 14: c672034cb3 = 14: 78a0762057 sha1-file.c: remove implicit dependency on the_index 15: ce460601c2 = 15: 91bf6b553a rerere.c: remove implicit dependency on the_index 16: 5b338d60aa = 16: b0ee54a0ad userdiff.c: remove implicit dependency on the_index 17: af2269eba7 = 17: 6a7cea2510 line-range.c: remove implicit dependency on the_index 18: 8090b8415f = 18: a19193217a submodule.c: remove implicit dependency on the_index 19: 5db39ed3ef = 19: b0dc3a2f5d tree-diff.c: remove implicit dependency on the_index 20: d3811221c8 = 20: 60e495cd36 ws.c: remove implicit dependency on the_index 21: c313cf1f20 = 21: 5b3c7e6ca4 revision.c: remove implicit dependency on the_index 22: c915607c60 = 22: 357394f04d revision.c: reduce implicit dependency the_repository
Nguyễn Thái Ngọc Duy (23):
archive.c: remove implicit dependency the_repository read-cache.c: remove 'const' from index_has_changes() diff.c: reduce implicit dependency on the_index combine-diff.c: remove implicit dependency on the_index blame.c: rename "repo" argument to "r"
diff.c: remove the_index dependency in textconv() functions grep.c: remove implicit dependency on the_index diff.c: remove implicit dependency on the_index read-cache.c: remove implicit dependency on the_index diff-lib.c: remove implicit dependency on the_index ll-merge.c: remove implicit dependency on the_index merge-blobs.c: remove implicit dependency on the_index merge.c: remove implicit dependency on the_index patch-ids.c: remove implicit dependency on the_index sha1-file.c: remove implicit dependency on the_index rerere.c: remove implicit dependency on the_index userdiff.c: remove implicit dependency on the_index line-range.c: remove implicit dependency on the_index submodule.c: remove implicit dependency on the_index tree-diff.c: remove implicit dependency on the_index ws.c: remove implicit dependency on the_index revision.c: remove implicit dependency on the_index revision.c: reduce implicit dependency the_repository
Documentation/technical/api-diff.txt | 4 +- .../technical/api-revision-walking.txt | 4 +- apply.c | 19 +- archive-zip.c | 14 +- archive.c | 2 +- bisect.c | 4 +- blame.c | 63 +++-- builtin/add.c | 4 +- builtin/am.c | 10 +- builtin/blame.c | 4 +- builtin/cat-file.c | 6 +- builtin/checkout.c | 7 +- builtin/commit.c | 4 +- builtin/describe.c | 4 +- builtin/diff-files.c | 2 +- builtin/diff-index.c | 2 +- builtin/diff-tree.c | 2 +- builtin/diff.c | 4 +- builtin/difftool.c | 2 +- builtin/fast-export.c | 2 +- builtin/fmt-merge-msg.c | 2 +- builtin/grep.c | 7 +- builtin/hash-object.c | 2 +- builtin/log.c | 25 +- builtin/merge-tree.c | 2 +- builtin/merge.c | 16 +- builtin/pack-objects.c | 2 +- builtin/prune.c | 2 +- builtin/pull.c | 9 +- builtin/range-diff.c | 2 +- builtin/reflog.c | 2 +- builtin/replace.c | 2 +- builtin/rerere.c | 6 +- builtin/reset.c | 1 + builtin/rev-list.c | 2 +- builtin/revert.c | 2 +- builtin/shortlog.c | 2 +- builtin/submodule--helper.c | 2 +- builtin/update-index.c | 2 +- bundle.c | 4 +- cache.h | 14 +- combine-diff.c | 32 ++- diff-lib.c | 21 +- diff-no-index.c | 9 +- diff.c | 261 ++++++++++-------- diff.h | 22 +- diffcore-break.c | 12 +- diffcore-delta.c | 12 +- diffcore-pickaxe.c | 8 +- diffcore-rename.c | 35 ++- diffcore.h | 13 +- grep.c | 34 ++- grep.h | 10 +- http-push.c | 2 +- line-log.c | 25 +- line-range.c | 22 +- line-range.h | 6 +- list-objects.c | 8 +- ll-merge.c | 17 +- ll-merge.h | 5 +- merge-blobs.c | 16 +- merge-blobs.h | 7 +- merge-recursive.c | 7 +- merge.c | 20 +- notes-merge.c | 9 +- pack-bitmap-write.c | 2 +- patch-ids.c | 4 +- patch-ids.h | 3 +- read-cache.c | 33 ++- ref-filter.c | 2 +- remote.c | 2 +- rerere.c | 121 ++++---- rerere.h | 10 +- revision.c | 76 ++--- revision.h | 15 +- sequencer.c | 18 +- sha1-file.c | 50 ++-- shallow.c | 2 +- submodule.c | 34 ++- submodule.h | 9 +- t/helper/test-revision-walking.c | 2 +- transport.c | 9 +- tree-diff.c | 2 +- userdiff.c | 5 +- userdiff.h | 3 +- ws.c | 5 +- wt-status.c | 10 +- 87 files changed, 749 insertions(+), 552 deletions(-)
Signature · 1 line
2.19.0.640.gcd3aa10a8a