Re: [PATCH v2 2/3] rebase -i: re-fix short SHA-1 collision

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 20, 2020, 20:04 UTC
Message-ID: <nycvar.QRO.7.76.6.2001202103221.46@tvgsbejvaqbjf.bet>
In-Reply-To: <CAPig+cT8t39UvnF2i6CDoHW4kfEGr-CRFxZKOCstCTU0YzrCgQ@mail.gmail.com>

Hi Eric,

On Mon, 20 Jan 2020, Eric Sunshine wrote:

Show 14 quoted lines

> On Fri, Jan 17, 2020 at 6:38 PM Johannes Schindelin via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> > @@ -1264,13 +1264,24 @@ test_expect_success SHA1 'short SHA-1 setup' '
> >  test_expect_success SHA1 'short SHA-1 collide' '
> >         test_when_finished "reset_rebase && git checkout master" &&
> >         git checkout collide &&
> > +       colliding_sha1=6bcda37 &&
> > +       test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
>
> How much do we care that this is introducing new code with git
> upstream of a pipe (considering recent efforts to eradicate such
> usage)? Same question regarding several other new instances introduce
> by this patch.

I would argue that the test case will fail if the `git` call fails. So I am not overly concerned if that `git` call is upstream of a pipe.

Ciao, Dscho