Re: [PATCH 2/2] t9502: test gitweb index hash formatting with modes

[Junio C Hamano <gitster@pobox.com>]

Travor@web.codeaurora.org, "Liu <travor_lzh"@outlook.com writes:

> From: Travor Liu <travor_lzh@outlook.com>
>
> gitweb should shorten and link the object IDs in commitdiff index lines
> even when Git includes the trailing file mode:
>
>     index <old>..<new> 100644
>
> Add coverage for that common form by rendering a commitdiff for a
> regular file modification.  Check that the visible index line contains
> linked short blob IDs followed by the mode and file-type annotation,
> and that the full unlinked form is not emitted.
>
> Signed-off-by: Travor Liu <travor_lzh@outlook.com>
> ---
>  t/t9502-gitweb-standalone-parse-output.sh | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

If the new test added by this patch validates the "fix" in
[PATCH 1/2], reviewing the change might be easier if the two
were squashed into a single patch.

> diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
> index 81d5625..7f37e26 100755
> --- a/t/t9502-gitweb-standalone-parse-output.sh
> +++ b/t/t9502-gitweb-standalone-parse-output.sh
> @@ -115,6 +115,20 @@ test_expect_success 'snapshot: hierarchical branch name (xx/test)' '
>  '
>  test_debug 'cat gitweb.headers'
>  
> +test_expect_success 'commitdiff: index line shortens hashes with mode' '
> +	old_blob=$(git rev-parse HEAD:foo) &&
> +	old_short=$(git rev-parse --short=7 HEAD:foo) &&
> +	echo changed >foo &&
> +	git commit -am "change foo" &&
> +	new_blob=$(git rev-parse HEAD:foo) &&
> +	new_short=$(git rev-parse --short=7 HEAD:foo) &&
> +	gitweb_run "p=.git;a=commitdiff;h=HEAD" &&
> +	grep ">${old_short}</a>\\.\\.<a [^>]*>${new_short}</a> 100644" \
> +		gitweb.body >index_line &&
> +	grep "<span class=\"info\"> (file)</span>" index_line &&
> +	! grep "index ${old_blob}\\.\\.${new_blob} 100644" gitweb.body
> +'

Can we use "test_grep" (for positive "this string must be there") and
"test_grep !" (for negative "it is an error if this string appears"
(note that exclamation point comes after test_grep))?  It would make
it easier to diagnose a failing test.

Also, there is a topic in flight that enforces the use of test_grep in
these test scripts, and use of raw grep like the above would break
under those stricter rules.

Thanks.