Re: [PATCH v5 3/4] cache-tree: subdirectory tests

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 8, 2014, 17:38 UTC
Message-ID: <xmqqsimbagzk.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1404779625-16972-3-git-send-email-dturner@twitter.com>

David Turner <dturner@twopensource.com> writes:

> +	printf "invalid                                  %s ()\n" "" "$@" >expect &&
> +	test-dump-cache-tree | \
> +	sed -n -e "s/$_x40/SHA/" -e "s/[0-9]* subtrees//g" -e '/#(ref)/d' -e '/^invalid /p' >actual &&

You only show lines that begin with "invalid ". Does the first "redact any object name to S H A" matter? Also do more than one "N subtrees" appear on an output line?

Show 30 quoted lines

> +	test_cmp expect actual
>  }
>  
>  test_no_cache_tree () {
> @@ -49,6 +50,25 @@ test_expect_success 'git-add invalidates cache-tree' '
>  	test_invalid_cache_tree
>  '
>  
> +test_expect_success 'git-add in subdir invalidates cache-tree' '
> +	test_when_finished "git reset --hard; git read-tree HEAD" &&
> +	mkdir dirx &&
> +	echo "I changed this file" >dirx/foo &&
> +	git add dirx/foo &&
> +	test_invalid_cache_tree
> +'
> +
> +test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
> +	git tag no-children &&
> +	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
> +	mkdir dir1 dir2 &&
> +	test_commit dir1/a &&
> +	test_commit dir2/b &&
> +	echo "I changed this file" >dir1/a &&
> +	git add dir1/a &&
> +	test_invalid_cache_tree dir1/
> +'
> +
>  test_expect_success 'update-index invalidates cache-tree' '
>  	test_when_finished "git reset --hard; git read-tree HEAD" &&
>  	echo "I changed this file" >foo &&