Skip to content

Make unpack_trees() do separate source and destination indexes

Linus Torvalds git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4Fix tree-walking compare_entry() in the presense of --prefixtree-walk.c+3 -00 replies
2/4Add 'const' where appropriate to index handling functionscache.h hash.c hash.h +1 more+16 -160 replies
3/4Make 'unpack_trees()' take the index to work on as an argumentbuiltin-checkout.c builtin-commit.c builtin-merge-recursive.c +4 more+52 -390 replies
4/4Make 'unpack_trees()' have a separate source and destination indexbuiltin-checkout.c builtin-commit.c builtin-merge-recursive.c +4 more+101 -1524 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 0/4] Make unpack_trees() do separate source and destination indexes

Ok, this goes on top of the five-commit series yesterday. The first two patches are pure fixes and cleanups, the third one does a fairly mechanical thing to get rid of implied usage of "the_index", and the last one actually splits up the source and destination index handling.

Linus Torvalds (4):
Fix tree-walking compare_entry() in the presense of --prefix Add 'const' where appropriate to index handling functions Make 'unpack_trees()' take the index to work on as an argument Make 'unpack_trees()' have a separate source and destination index

The nice thing to see is how this clearly removes more lines than it adds, and the code is a bit more readable too, I think.

 builtin-checkout.c        |    9 +++
 builtin-commit.c          |    2 +
 builtin-merge-recursive.c |    2 +
 builtin-read-tree.c       |   23 +------
 cache.h                   |   10 ++--
 diff-lib.c                |   47 ++-----------
 hash.c                    |    6 +-
 hash.h                    |    4 +-
 read-cache.c              |   12 ++--
 tree-walk.c               |    3 +
 unpack-trees.c            |  158 ++++++++++++++++++++++-----------------------
 unpack-trees.h            |   15 +++--
 12 files changed, 128 insertions(+), 163 deletions(-)