Re: [PATCH v2] revision: fix memory leak in prepare_show_merge()

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 9, 2025, 20:48 UTC
Message-ID: <xmqqldq0prpa.fsf@gitster.g>
In-Reply-To: <pull.1989.v2.git.git.1749456990648.gitgitgadget@gmail.com>

"Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com> writes:

> +test_expect_success 'show unmerged index' '
> +    git reset --hard &&

We use tabs for indent.

> +
> +    git switch -C base &&
> +    echo "base" > conflicting &&

Let's lose the SP between redirection operator ">" and its target "conflicting", i.e.

	echo "base" >conflicting &&

Show 22 quoted lines

> +    git add conflicting &&
> +    git commit -m "base" &&
> +
> +    git branch hello &&
> +    git branch goodbye &&
> +
> +    git switch hello &&
> +    echo "hello" > conflicting &&
> +    git commit -am "hello" &&
> +
> +    git switch goodbye &&
> +    echo "goodbye" > conflicting &&
> +    git commit -am "goodbye" &&
> +
> +    git switch hello &&
> +    test_must_fail git merge goodbye &&
> +    git show --merge HEAD
> +'
> +
>  test_done
>
> base-commit: 7014b55638da979331baf8dc31c4e1d697cf2d67