Re: [PATCH v2 1/5] merge-tree: fail with a non-zero exit code on missing tree objects

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Feb 7, 2024, 17:02 UTC
Message-ID: <CAPig+cSs8MFkLasTULh7tybrFm7SwaT+JeR7HnXjh+-agCHYMw@mail.gmail.com>
In-Reply-To: <01dfd66568c1818819e81e001cc189f9066d0cf0.1707324462.git.gitgitgadget@gmail.com>

On Wed, Feb 7, 2024 at 11:48 AM Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 16 quoted lines

> When `git merge-tree` encounters a missing tree object, it should error
> out and not continue quietly as if nothing had happened.
>
> However, as of time of writing, `git merge-tree` _does_ continue, and
> then offers the empty tree as result.
>
> Let's fix this.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> diff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh
> @@ -951,4 +951,14 @@ test_expect_success '--merge-base with tree OIDs' '
> +test_expect_success 'error out on missing tree objects' '
> +       git init --bare missing-tree.git &&
> +       git rev-list side3 >list &&
> +       git rev-parse side3^: >list &&

Isn't the git-rev-parse invocation simply overwriting "list" rather than appending to it? Did you mean:

    git rev-list side3 >list &&
    git rev-parse side3^: >>list &&

An alternative would be:

    {
        git rev-list side3 &&
        git rev-parse side3^:
    } >list &&

Show 5 quoted lines

> +       git pack-objects missing-tree.git/objects/pack/side3-tree-is-missing <list &&
> +       side3=$(git rev-parse side3) &&
> +       test_must_fail git --git-dir=missing-tree.git merge-tree $side3^ $side3 >actual &&
> +       test_must_be_empty actual
> +'