Re: [PATCH] diff: add test showing regression to --relative

From: Jeff King <peff@peff.net>
Date: Dec 7, 2017, 01:04 UTC
Message-ID: <20171207010421.GC1975@sigill.intra.peff.net>
In-Reply-To: <20171207003517.11729-1-jacob.e.keller@intel.com>

On Wed, Dec 06, 2017 at 04:35:17PM -0800, Jacob Keller wrote:

> Subject: [PATCH] diff: add test showing regression to --relative

Since we'd hopefully not ever merge that regression, I think this patch ought to stand on its own. In which case it probably wants to say something like:

  diff: test --relative without a prefix

  We already test "diff --relative=subdir", but not that
  "--relative" by itself should use the current directory as
  its prefix.

Show 12 quoted lines

> diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
> index 3950f5034d31..41e4f59b2ffb 100755
> --- a/t/t4045-diff-relative.sh
> +++ b/t/t4045-diff-relative.sh
> @@ -70,4 +70,9 @@ for type in diff numstat stat raw; do
>  	check_$type dir/file2 --relative=sub
>  done
>  
> +cd subdir
> +for type in diff numstat stat raw; do
> +	check_$type file2 --relative
> +done

We should avoid moving the cwd of the whole test script in case we add tests later. Normally we'd do the cd inside a subshell, but that's complicated by the wrapper (we wouldn't want to increment the test counter just inside the subshell, for instance).

Adding "cd .." is the smallest thing we could do to fix that. But I think the more robust solution is to actually teach the check_* helper about doing the "cd" inside the test_expect block. Or just pushing the helper down into the test block and living with repeating the "test_expect_success" parts for each call.

-Peff