]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/read-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Mar 2021 21:35:37 +0000 (14:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Mar 2021 21:35:37 +0000 (14:35 -0700)
Code simplification by removing support for a caller that is long gone.

* ab/read-tree:
  tree.h API: simplify read_tree_recursive() signature
  tree.h API: expose read_tree_1() as read_tree_at()
  archive: stop passing "stage" through read_tree_recursive()
  ls-files: refactor away read_tree()
  ls-files: don't needlessly pass around stage variable
  tree.c API: move read_tree() into builtin/ls-files.c
  ls-files tests: add meaningful --with-tree tests
  show tests: add test for "git show <tree>"

1  2 
archive.c
cache.h
merge-recursive.c

diff --cc archive.c
Simple merge
diff --cc cache.h
Simple merge
Simple merge