Re: [PATCH 2/3] Add test for commit --dry-run --short.

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Sep 1, 2018, 11:55 UTC
Message-ID: <20180901115521.GA18536@localhost>
In-Reply-To: <20180831053921.8083-3-ischis2@cox.net>

On Thu, Aug 30, 2018 at 10:39:20PM -0700, Stephen P. Smith wrote:

Show 12 quoted lines

> diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
> index 810d4cea7..fc69da816 100755
> --- a/t/t7501-commit.sh
> +++ b/t/t7501-commit.sh
> @@ -682,4 +682,14 @@ test_expect_success '--dry-run with conflicts fixed from a merge' '
>  	git commit -m "conflicts fixed from merge."
>  '
>  
> +test_expect_success '--dry-run --short with conflicts fixed from a merge' '
> +	# setup two branches with conflicting information
> +	# in the same file, resolve the conflict,
> +	# call commit with --dry-run --short

I think the last line of the comment is unnecessary: it doesn't say anything that is not obvious from the test's last line.

> +	rm -f test-file &&
> +	touch testfile &&

That filename should be 'test-file', i.e. with a dash, shouldn't it?

Anyway, if you want to truncate the file, then please use '>test-file' instead of 'rm' and 'touch'.

Show 8 quoted lines

> +	git add test-file &&
> +	git commit --dry-run --short
> +'
> +
>  test_done
> -- 
> 2.18.0
>