Re: [PATCH v2] sequencer: avoid dropping fixup commit that targets self via commit-ish
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 21, 2022, 18:47 UTC
- Message-ID
- <xmqqa66s36pt.fsf@gitster.g>
- In-Reply-To
- <20220920031140.1220220-1-aclopte@gmail.com>
Johannes Altmanninger <aclopte@gmail.com> writes:
Show 12 quoted lines
> +test_expect_success 'auto squash that matches regex' '
> + git reset --hard base &&
> + git commit --allow-empty -m "hay needle hay" &&
> + git commit --allow-empty -m "fixup! :/needle" &&
> + GIT_SEQUENCE_EDITOR="cat >tmp" git rebase --autosquash -i HEAD^^ &&
> + sed -ne "/^[^#]/{s/[0-9a-f]\{7,\}/HASH/g;p;}" tmp >actual &&
> + cat <<-EOF >expect &&
> + pick HASH hay needle hay # empty
> + fixup HASH fixup! :/needle # empty
> + EOF
> + test_cmp expect actual
> +'hint: Waiting for your editor to close the file... Successfully rebased and updated refs/heads/main. --- expect 2022-09-21 18:45:27.617530848 +0000 +++ actual 2022-09-21 18:45:27.613530478 +0000
@@ -1,2 +1,2 @@ pick HASH hay needle hay # empty -fixup HASH fixup! :/needle # empty +pick HASH fixup! :/needle # empty not ok 11 - auto squash that matches regex That does not look very good X-<.