From: Johannes Altmanninger <aclopte@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Erik Cervin Edin <erik@cervined.in>, git@vger.kernel.org
Subject: Re: [PATCH] sequencer: avoid dropping fixup commit that targets self via commit-ish
Date: Mon, 19 Sep 2022 22:27:21 -0500 [thread overview]
Message-ID: <YykzGTMuKUGM793U@gmail.com> (raw)
In-Reply-To: <xmqqmtav7ygq.fsf@gitster.g>
On Mon, Sep 19, 2022 at 04:09:57PM -0700, Junio C Hamano wrote:
> Johannes Altmanninger <aclopte@gmail.com> writes:
>
> > +test_expect_success 'auto squash of fixup commit that matches branch name which points back to fixup commit' '
> > ...
> > + sed -ne "/^[^#]/{s/[0-9a-f]\{7,\}/HASH/g;p}" tmp >actual &&
FWIW I copied and adapted this one from the remerge-diff tests. Not sure
what other tests use. Maybe the HASH replacement is worth a test helper even
though it is a heuristic that can go wrong.
prev parent reply other threads:[~2022-09-20 3:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 14:45 [BUG] fixup commit is dropped during rebase if subject = branch name Erik Cervin Edin
2022-09-17 18:04 ` Junio C Hamano
2022-09-18 14:55 ` Erik Cervin Edin
2022-09-17 23:19 ` Johannes Altmanninger
2022-09-18 12:10 ` [PATCH] sequencer: avoid dropping fixup commit that targets self via commit-ish Johannes Altmanninger
2022-09-18 15:05 ` Erik Cervin Edin
2022-09-18 17:54 ` Johannes Altmanninger
2022-09-19 1:11 ` Junio C Hamano
2022-09-19 16:07 ` Junio C Hamano
2022-09-20 3:20 ` Johannes Altmanninger
2022-09-19 16:23 ` Junio C Hamano
2022-09-20 3:11 ` [PATCH v2] " Johannes Altmanninger
2022-09-20 8:26 ` Phillip Wood
2022-09-21 18:47 ` Junio C Hamano
2022-09-22 4:00 ` Johannes Altmanninger
2022-09-22 19:32 ` Junio C Hamano
2022-09-24 22:29 ` [PATCH v3] " Johannes Altmanninger
2022-09-19 23:09 ` [PATCH] " Junio C Hamano
2022-09-20 3:27 ` Johannes Altmanninger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YykzGTMuKUGM793U@gmail.com \
--to=aclopte@gmail.com \
--cc=erik@cervined.in \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.