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

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jan 20, 2020, 16:49 UTC
Message-ID: <CAPig+cT8t39UvnF2i6CDoHW4kfEGr-CRFxZKOCstCTU0YzrCgQ@mail.gmail.com>
In-Reply-To: <102fa568dc09c1faa2d36903ccb7e1b285dd50b2.1579304283.git.gitgitgadget@gmail.com>

On Fri, Jan 17, 2020 at 6:38 PM Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 7 quoted lines

> 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.