Re: [PATCH v7 03/15] t6060: add tests for removed files

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 22, 2021, 21:36 UTC
Message-ID: <nycvar.QRO.7.76.6.2103222235150.50@tvgsbejvaqbjf.bet>
In-Reply-To: <20210317204939.17890-4-alban.gruin@gmail.com>

Hi Alban,

On Wed, 17 Mar 2021, Alban Gruin wrote:

> Until now, t6060 did not not check git-mere-one-file's behaviour when a

Channeling my inner Eric Sunshine: s/mere-one/merge-one/ ;-)

> file is deleted in a branch.  To avoid regressions on this during the
> conversion, this adds a new file, `file3', in the commit tagged as`base', and

Maybe "during the conversion from shell script to C"?

Other than that, looks good to me! Thanks, Dscho

Show 39 quoted lines

> deletes it in the commit tagged as `two'.
>
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---
>  t/t6060-merge-index.sh | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/t/t6060-merge-index.sh b/t/t6060-merge-index.sh
> index 9e15ceb957..0cbd8a1f7f 100755
> --- a/t/t6060-merge-index.sh
> +++ b/t/t6060-merge-index.sh
> @@ -8,12 +8,14 @@ test_expect_success 'setup diverging branches' '
>  		echo $i
>  	done >file &&
>  	cp file file2 &&
> -	git add file file2 &&
> +	cp file file3 &&
> +	git add file file2 file3 &&
>  	git commit -m base &&
>  	git tag base &&
>  	sed s/2/two/ <file >tmp &&
>  	mv tmp file &&
>  	cp file file2 &&
> +	git rm file3 &&
>  	git commit -a -m two &&
>  	git tag two &&
>  	git checkout -b other HEAD^ &&
> @@ -41,6 +43,7 @@ test_expect_success 'read-tree does not resolve content merge' '
>  	cat >expect <<-\EOF &&
>  	file
>  	file2
> +	file3
>  	EOF
>  	git read-tree -i -m base ten two &&
>  	git diff-files --name-only --diff-filter=U >unmerged &&
> --
> 2.31.0
>
>