Re: [PATCH v4] blame: print unblamable and ignored commits in porcelain mode

From: phillip.wood123@gmail.com <phillip.wood123@gmail.com>
Date: Mar 31, 2025, 10:24 UTC
Message-ID: <72b19ccb-a6a8-4aca-b70e-b879ec15cff1@gmail.com>
In-Reply-To: <20250330204339.191382-1-karthik.188@gmail.com>

Hi Karthik

On 30/03/2025 21:43, Karthik Nayak wrote:

Show 10 quoted lines

>   
> +for opt in --porcelain --line-porcelain
> +do
> +	test_expect_success "mark_unblamable_lines with $opt" '
> +		sha=$(git rev-parse Y) &&
> +
> +		git -c blame.markUnblamableLines=false blame $opt --ignore-rev Y file >raw &&
> +		sed -e "s/^\ty3/unblamable\n&/" raw >expect &&
> +		cp expect raw &&
> +		sed -e "s/^\ty4/unblamable\n&/" raw >expect &&

Thanks for improving the test. Unfortunately using '\n' in the replacement text is not portable [1] (the normal backslash escapes are allowed in the pattern though so the '\t' is fine). One has to write a literal newline escaped with a backslash. However here we want to insert a whole new line of text into the output without changing the original so I would write it as

     sed -e "/^\ty3/a\\" -e unblamable -e "/^\ty4/a\\" -e unblamable \
	raw >expect

Best Wishes

Phillip

[1] <https://pubs.opengroup.org/onlinepubs/9799919799/>

     The relevant section of the text reads

     A line can be split by substituting a <newline> into it. The
     application shall escape the <newline> in the replacement by
     preceding it by a <backslash>.

     The meaning of an unescaped <backslash> immediately followed by any
     character other than '&', <backslash>, a digit, <newline>, or the
     delimiter character used for this command, is unspecified.

Show 31 quoted lines

> +
> +		git -c blame.markUnblamableLines=true blame $opt --ignore-rev Y file >actual &&
> +		test_cmp expect actual
> +	'
> +done
> +
>   # Commit Z will touch the first two lines.  Y touched all four.
>   # 	A--B--X--Y--Z
>   # The blame output when ignoring Z should be:
> @@ -191,6 +206,21 @@ test_expect_success mark_ignored_lines '
>   	! test_cmp expect actual
>   '
>   
> +for opt in --porcelain --line-porcelain
> +do
> +	test_expect_success "mark_ignored_lines with $opt" '
> +		sha=$(git rev-parse Y) &&
> +
> +		git -c blame.markIgnoredLines=false blame $opt --ignore-rev Z file >raw &&
> +		sed -e "s/^\tline-one-Z/ignored\n&/" raw >expect &&
> +		cp expect raw &&
> +		sed -e "s/^\tline-two-Z/ignored\n&/" raw >expect &&
> +
> +		git -c blame.markIgnoredLines=true blame $opt --ignore-rev Z file >actual &&
> +		test_cmp expect actual
> +	'
> +done
> +
>   # For ignored revs that added 'unblamable' lines and more recent commits changed
>   # the blamable lines, mark the unblamable lines with a
>   # '*'