On Mon, Mar 15, 2021 at 4:44 PM Ævar Arnfjörð Bjarmason
<avarab@xxxxxxxxx> wrote:
>
> Add missing tests for showing a tree with "git show". Let's test for
> showing a tree, two trees, and that doing so doesn't recurse.
>
> The only tests for this code added in 5d7eeee2ac6 (git-show: grok
> blobs, trees and tags, too, 2006-12-14) were the tests in
> t7701-repack-unpack-unreachable.sh added in ccc1297226b (repack:
> modify behavior of -A option to leave unreferenced objects unpacked,
> 2008-05-09).
>
> Let's add this common mode of operation to the "show" tests
> themselves. It's more obvious, and the tests in
> t7701-repack-unpack-unreachable.sh happily parse if we start buggily
> emitting trees recursively.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
> ---
> t/t7007-show.sh | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/t/t7007-show.sh b/t/t7007-show.sh
> index 42d3db62468..37ce718b231 100755
> --- a/t/t7007-show.sh
> +++ b/t/t7007-show.sh
> @@ -38,6 +38,45 @@ test_expect_success 'showing two commits' '
> test_cmp expect actual.filtered
> '
>
> +test_expect_success 'showing a tree' '
> + cat >expected <<-EOF &&
> + tree main1:
> +
> + main1.t
> + EOF
> + git show main1: >actual &&
I had used COMMIT:PATH syntax before, but I was unaware PATH could be
empty to refer to the toplevel tree.
Still, it seems main1^{tree} might be a bit clearer?
> + test_cmp expected actual
> +'
> +
> +test_expect_success 'showing two trees' '
> + cat >expected <<-EOF &&
> + tree main1:
> +
> + main1.t
> +
> + tree main2:
> +
> + main1.t
> + main2.t
> + EOF
> + git show main1: main2: >actual &&
> + test_cmp expected actual
> +'
> +
> +test_expect_success 'showing a trees is not recursive' '
> + git worktree add not-recursive main1 &&
> + mkdir not-recursive/a &&
> + test_commit -C not-recursive a/file &&
> + cat >expected <<-EOF &&
> + tree a/file:
> +
> + a/
> + main1.t
> + EOF
> + git -C not-recursive show a/file: >actual &&
a/file: was really confusing to me. Perhaps I should have
known/remembered that a/file was both a filename and a tagname (I
dislike that part of test_commit), and you are just using that tag but
I had to fetch your changes and run them and play around to figure out
what was going on here.
Can we just use "HEAD^{tree}" instead of "a/file:" ?
> + test_cmp expected actual
> +'
> +
> test_expect_success 'showing a range walks (linear)' '
> cat >expect <<-EOF &&
> commit $(git rev-parse main3)
> --
> 2.31.0.rc2.211.g1d0b8788b3
